brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [54/71] [abbrv] incubator-brooklyn git commit: Fix up mobile app
Date Sun, 29 Mar 2015 03:03:12 GMT
Fix up mobile app

* relative paths in HTML and js
* alter group ID
* add to sandbox pom along with cassandra-snitch
* swaps Cloudsoft logos for Brooklyn


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c5551b7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c5551b7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c5551b7d

Branch: refs/heads/master
Commit: c5551b7d354cf1745b2d1cf9e5f66f401a6cce4e
Parents: d9850a1
Author: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Authored: Fri Feb 6 18:29:22 2015 +0000
Committer: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Committed: Fri Feb 6 18:29:22 2015 +0000

----------------------------------------------------------------------
 pom.xml                                         |   2 +
 sandbox/mobile-app/pom.xml                      |  11 +-
 .../main/webapp/assets/mobile/css/mobile.css    |   2 +-
 .../Powered-by-Cloudsoft-AMP-Logo-on-blue.png   | Bin 30107 -> 0 bytes
 .../Powered-by-Cloudsoft-AMP-Logo-on-white.png  | Bin 28288 -> 0 bytes
 .../images/Powered-by-Cloudsoft-AMP-Logo.png    | Bin 30522 -> 0 bytes
 .../assets/mobile/images/brooklyn-logo.png      | Bin 0 -> 7055 bytes
 .../src/main/webapp/assets/mobile/js/app.js     |  18 ++--
 sandbox/mobile-app/src/main/webapp/index.m.html | 104 +++++++++----------
 9 files changed, 67 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 402ba2b..fa50de4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1328,6 +1328,8 @@
                 <module>sandbox/nosql</module>
                 <module>sandbox/monitoring</module>
                 <module>sandbox/examples/simple-open-loop-policy</module>
+                <module>sandbox/cassandra-multicloud-snitch</module>
+                <module>sandbox/mobile-app</module>
             </modules>
         </profile>
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/pom.xml b/sandbox/mobile-app/pom.xml
index cdb7f76..99c6ca7 100644
--- a/sandbox/mobile-app/pom.xml
+++ b/sandbox/mobile-app/pom.xml
@@ -23,27 +23,22 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
 
+    <groupId>org.apache.brooklyn.sandbox</groupId>
     <artifactId>brooklyn-mobile-app</artifactId>
 
-    <name>Brooklyn Mobile GUI</name>
+    <name>Brooklyn Mobile UI</name>
 
     <description>
         A mobile skin for Brooklyn
     </description>
 
     <parent>
-        <groupId>io.brooklyn</groupId>
+        <groupId>org.apache.brooklyn</groupId>
         <artifactId>brooklyn-parent</artifactId>
         <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <project.build.webapp>
-            ${project.build.directory}/${project.build.finalName}
-        </project.build.webapp>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.testng</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/css/mobile.css
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/css/mobile.css b/sandbox/mobile-app/src/main/webapp/assets/mobile/css/mobile.css
index 8ddaf8a..0e729fb 100644
--- a/sandbox/mobile-app/src/main/webapp/assets/mobile/css/mobile.css
+++ b/sandbox/mobile-app/src/main/webapp/assets/mobile/css/mobile.css
@@ -21,7 +21,7 @@
 	height:28px;
 	float:right;
 	margin: 20px 20px;
-	content:url("/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-blue.png");
+	content:url("../images/brooklyn-logo.png");
 }
 
 .navbar-absolute-bottom{

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-blue.png
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-blue.png
b/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-blue.png
deleted file mode 100644
index 4e6b2b3..0000000
Binary files a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-blue.png
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-white.png
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-white.png
b/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-white.png
deleted file mode 100644
index 7143636..0000000
Binary files a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo-on-white.png
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo.png
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo.png
b/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo.png
deleted file mode 100644
index a627f53..0000000
Binary files a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/Powered-by-Cloudsoft-AMP-Logo.png
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/images/brooklyn-logo.png
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/images/brooklyn-logo.png b/sandbox/mobile-app/src/main/webapp/assets/mobile/images/brooklyn-logo.png
new file mode 100755
index 0000000..27b2e5a
Binary files /dev/null and b/sandbox/mobile-app/src/main/webapp/assets/mobile/images/brooklyn-logo.png
differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/assets/mobile/js/app.js
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/assets/mobile/js/app.js b/sandbox/mobile-app/src/main/webapp/assets/mobile/js/app.js
index cedad5d..906a4f4 100644
--- a/sandbox/mobile-app/src/main/webapp/assets/mobile/js/app.js
+++ b/sandbox/mobile-app/src/main/webapp/assets/mobile/js/app.js
@@ -29,42 +29,42 @@ var app = angular.module('BrooklynMobile', [
 app.config(function($routeProvider, $translateProvider) {
 	//Defaults root to applications.  Should change in the future
 	$routeProvider.when('/', {
-		templateUrl : "/assets/mobile/js/templates/applicationsList.html",
+		templateUrl : "assets/mobile/js/templates/applicationsList.html",
 		controller:"ApplicationListController"
 	});
 	
 	//Lists applications
 	$routeProvider.when('/v1/applications', {
-		templateUrl : "/assets/mobile/js/templates/applicationsList.html",
+		templateUrl : "assets/mobile/js/templates/applicationsList.html",
 		controller:"ApplicationListController"
 	});
 	
 	//List entities
 	$routeProvider.when('/v1/applications/:appId/entities/:id', {
-		templateUrl : "/assets/mobile/js/templates/entitiesList.html",
+		templateUrl : "assets/mobile/js/templates/entitiesList.html",
 		controller:"EntityListController"
 	});
 	$routeProvider.when('/v1/applications/:appId/entities', {
-		templateUrl : "/assets/mobile/js/templates/entitiesList.html",
+		templateUrl : "assets/mobile/js/templates/entitiesList.html",
 		controller:"EntityListController"
 	});
 	$routeProvider.when('/v1/applications/:appId', {
-		templateUrl : "/assets/mobile/js/templates/entitiesList.html",
+		templateUrl : "assets/mobile/js/templates/entitiesList.html",
 		controller:"EntityListController"
 	});
 	
 	//Application and entity details
 	$routeProvider.when('/v1/applications/:appId/entities/:id/summary', {
-		templateUrl : "/assets/mobile/js/templates/entitySummary.html",
+		templateUrl : "assets/mobile/js/templates/entitySummary.html",
 		controller:"EntityDetailsController"
 	});
 	$routeProvider.when('/v1/applications/:appId/summary', {
-		templateUrl : "/assets/mobile/js/templates/entitySummary.html",
+		templateUrl : "assets/mobile/js/templates/entitySummary.html",
 		controller:"EntityDetailsController"
 	});
 	
 	$translateProvider.useStaticFilesLoader({
-		  prefix: '/assets/mobile/js/i18n/',
+		  prefix: 'assets/mobile/js/i18n/',
 		  suffix: '.json'
 		});
 	//$translateProvider.useLocalStorage();
@@ -81,4 +81,4 @@ app.controller('MainController', function($rootScope, $scope) {
 	$rootScope.$on("$routeChangeSuccess", function() {
 		$rootScope.loading = false;
 	});
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5551b7d/sandbox/mobile-app/src/main/webapp/index.m.html
----------------------------------------------------------------------
diff --git a/sandbox/mobile-app/src/main/webapp/index.m.html b/sandbox/mobile-app/src/main/webapp/index.m.html
index 12a3864..9c7ff35 100644
--- a/sandbox/mobile-app/src/main/webapp/index.m.html
+++ b/sandbox/mobile-app/src/main/webapp/index.m.html
@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -17,83 +17,83 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
-<!doctype html>
 <html ng-app="BrooklynMobile" ng-controller="MainController">
 <head title="{{'TITLE' | translate}}">
+    <meta charset='utf-8'/>
 
-<title>{{'TITLE' | translate}}</title>
-	<meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0,
minimal-ui" /> 
-<link rel="stylesheet" href="/assets/mobile/libs/mcasimir-mobile-angular-ui-be39011/dist/css/mobile-angular-ui-base.min.css"
/> 
-<link rel="stylesheet" href="/assets/mobile/css/mobile.css" />
+    <title>{{'TITLE' | translate}}</title>
+    <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0,
minimal-ui"/>
+    <link rel="stylesheet" href="assets/mobile/libs/mcasimir-mobile-angular-ui-be39011/dist/css/mobile-angular-ui-base.min.css"/>
+    <link rel="stylesheet" href="assets/mobile/css/mobile.css"/>
 
-	<script src="/assets/mobile/libs/angular-1.2.19/angular.min.js"></script>
-    <script src="/assets/mobile/libs/angular-1.2.19/angular-route.min.js"></script>
-    <script src="/assets/mobile/libs/angular-1.2.19/angular-touch.min.js"></script>
-    <script src="/assets/mobile/libs/angular-1.2.19/angular-resource.min.js"></script>
-     <script src="/assets/mobile/libs/angular-1.2.19/angular-cookies.min.js"></script>
-    <script src="/assets/mobile/libs/mcasimir-mobile-angular-ui-be39011/dist/js/mobile-angular-ui.min.js"></script>
+    <script src="assets/mobile/libs/angular-1.2.19/angular.min.js"></script>
+    <script src="assets/mobile/libs/angular-1.2.19/angular-route.min.js"></script>
+    <script src="assets/mobile/libs/angular-1.2.19/angular-touch.min.js"></script>
+    <script src="assets/mobile/libs/angular-1.2.19/angular-resource.min.js"></script>
+    <script src="assets/mobile/libs/angular-1.2.19/angular-cookies.min.js"></script>
+    <script src="assets/mobile/libs/mcasimir-mobile-angular-ui-be39011/dist/js/mobile-angular-ui.min.js"></script>
     <!-- NLS related -->
-    <script src="/assets/mobile/libs/angular-translate/angular-translate.min.js"></script>
-    <script src="/assets/mobile/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>

-    <script src="/assets/mobile/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
-    <script src="/assets/mobile/libs/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
-    <script src="/assets/mobile/js/services.js"></script>
-	<script src="/assets/mobile/js/controllers.js"></script>
-	<script src="/assets/mobile/js/filters.js"></script>
-	<script src="/assets/mobile/js/app.js"></script>
+    <script src="assets/mobile/libs/angular-translate/angular-translate.min.js"></script>
+    <script src="assets/mobile/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
+    <script src="assets/mobile/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.min.js"></script>
+    <script src="assets/mobile/libs/angular-translate-storage-local/angular-translate-storage-local.min.js"></script>
+    <script src="assets/mobile/js/services.js"></script>
+    <script src="assets/mobile/js/controllers.js"></script>
+    <script src="assets/mobile/js/filters.js"></script>
+    <script src="assets/mobile/js/app.js"></script>
 
 </head>
 <body>
 
 <!-- Sidebars -->
-    <div class="sidebar sidebar-left" toggleable parent-active-class="sidebar-left-in"
id="mainSidebar" yield-to="left-control-nav">
-    	<h2 class="app-name">{{'APP_NAME_SHORT' | translate}}</h2>
+<div class="sidebar sidebar-left" toggleable parent-active-class="sidebar-left-in" id="mainSidebar"
yield-to="left-control-nav">
+    <h2 class="app-name">{{'APP_NAME_SHORT' | translate}}</h2>
 
-		<div class="scrollable sidebar-scrollable">
-		  <div class="scrollable-content">
-		    <div class="list-group" toggle="off" bubble target="mainSidebar">
-		      <a class="list-group-item" href="#/v1/applications">{{'M_MENU_APPS' | translate}}</a>
-		      <a class="list-group-item" href="https://brooklyn.incubator.apache.org/quickstart/">{{'M_MENU_HELP'
| translate}}</a>
-		    </div>
-		  </div>
-		</div>
+    <div class="scrollable sidebar-scrollable">
+        <div class="scrollable-content">
+            <div class="list-group" toggle="off" bubble target="mainSidebar">
+                <a class="list-group-item" href="#/v1/applications">{{'M_MENU_APPS'
| translate}}</a>
+                <a class="list-group-item" href="https://brooklyn.incubator.apache.org/documentation/">{{'M_MENU_HELP'
|
+                    translate}}</a>
+            </div>
+        </div>
+    </div>
 
-		 <div class="navbar navbar-app navbar-footer navbar-absolute-bottom">
-			<img class="poweredLogo" alt="{{M_MENU_POWERED_BY}}"/>
-		 </div>
+    <div class="navbar navbar-app navbar-footer navbar-absolute-bottom">
+        <img class="poweredLogo" alt="{{M_MENU_POWERED_BY}}"/>
     </div>
-	<div class="sidebar sidebar-right" toggleable parent-active-class="sidebar-right-in"
id="rightSidebar" yield-to="right-control-nav">
-		&nbsp;
-	</div>
-	<div class="app">
+</div>
+<div class="sidebar sidebar-right" toggleable parent-active-class="sidebar-right-in" id="rightSidebar"
yield-to="right-control-nav">
+    &nbsp;
+</div>
+<div class="app">
 
-      <!-- Navbars -->
+    <!-- Navbars -->
 
-      <div class="navbar navbar-app navbar-absolute-top">
+    <div class="navbar navbar-app navbar-absolute-top">
         <div class="navbar-brand navbar-brand-center" yield-to="title">
-          <span>{{'APP_NAME_LONG' | translate}}</span>
+            <span>{{'APP_NAME_LONG' | translate}}</span>
         </div>
         <div class="btn-group pull-left" style="z-index:100;" yield-to="left-control-nav-icon-left">
-          <div ng-click="toggle('mainSidebar')" class="btn btn-navbar sidebar-toggle">
-            <i class="fa fa-bars"></i>
-          </div>
+            <div ng-click="toggle('mainSidebar')" class="btn btn-navbar sidebar-toggle">
+                <i class="fa fa-bars"></i>
+            </div>
         </div>
         <div class="btn-group pull-right" style="z-index:100;" yield-to="right-control-nav-icon-right">
-		&nbsp;
+            &nbsp;
         </div>
-       
-      </div>
 
-      <!-- App Body -->
-      <div class="app-body" ng-class="{loading: loading}">
+    </div>
+
+    <!-- App Body -->
+    <div class="app-body" ng-class="{loading: loading}">
         <div ng-show="loading" class="app-content-loading">
-          <i class="fa fa-spinner fa-spin fa-2x loading-spinner"></i>&nbsp;<span>{{'LOADING'
| translate}}</span>
+            <i class="fa fa-spinner fa-spin fa-2x loading-spinner"></i>&nbsp;<span>{{'LOADING'
| translate}}</span>
         </div>
 
         <ng-view class="app-content" ng-hide="loading"></ng-view>
-      </div>
-
     </div>
+
+</div>
 </body>
 </html>


Mime
View raw message