You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by er...@apache.org on 2013/08/27 20:10:44 UTC
svn commit: r1517903 - in
/rave/branches/angular/rave-portal-resources/src/main/webapp:
WEB-INF/jsp/views/ static/css/ static/css/bootstrap/less/
static/html/common/ static/html/common/partials/ static/html/portal/
static/images/ static/script/common/c...
Author: erinnp
Date: Tue Aug 27 18:10:44 2013
New Revision: 1517903
URL: http://svn.apache.org/r1517903
Log:
RAVE-1034: Set up nav bar menu controller. Applying patch from Mike Jett
Added:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/navbar.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/images/rave-dark-sm.png (with props)
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/controllers/NavBarCtrl.js
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/angular.jsp
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/bootstrap/less/scaffolding.less
rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-skin.less
rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/index.html
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/controllers/index.js
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/main.js
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/angular.jsp
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/angular.jsp?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/angular.jsp (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/angular.jsp Tue Aug 27 18:10:44 2013
@@ -59,6 +59,18 @@
</div>
+<footer>
+ <div class="container">
+ <div class="row">
+ <div class="span12 version">
+ <span>Apache Rave</span>
+ <a href="http://rave.apache.org"><img src="/portal/static/images/rave-logo-sm.png" title="Apache Rave"
+ alt="Apache Rave" class="footer-logo"></a>
+ </div>
+ </div>
+ </div>
+</footer>
+
<%--<div ng-view></div>--%>
</body>
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/bootstrap/less/scaffolding.less
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/bootstrap/less/scaffolding.less?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/bootstrap/less/scaffolding.less (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/bootstrap/less/scaffolding.less Tue Aug 27 18:10:44 2013
@@ -31,6 +31,8 @@ body {
line-height: @baseLineHeight;
color: @textColor;
background-color: @bodyBackground;
+ padding-top: @navbarHeight;
+ position: relative;
}
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-skin.less
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-skin.less?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-skin.less (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/css/rave-skin.less Tue Aug 27 18:10:44 2013
@@ -67,6 +67,11 @@ input, textarea, select, .uneditable-inp
padding: 5px 0;
background: url("@{imageDirPath}/rave-logo-sm.png") no-repeat 15px 0;
}
+.navbar .brand {
+ background: url("@{imageDirPath}/rave-dark-sm.png") no-repeat scroll 0 5px transparent;
+ padding: 8px 70px 12px;
+ text-indent: -9999px;
+}
.well{
.box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.25));
background: @lighterGray;
Added: rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/navbar.html
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/navbar.html?rev=1517903&view=auto
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/navbar.html (added)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/common/partials/navbar.html Tue Aug 27 18:10:44 2013
@@ -0,0 +1,28 @@
+<div class="navbar navbar-inverse navbar-fixed-top">
+ <div ng-controller="NavBarCtrl" class="navbar-inner">
+ <div class="container">
+
+ <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand">RAVE</span>
+
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+
+
+ <li ng-show="user.username"><a href="/portal/app/person/id/{{user.id}}">Profile</a></li>
+ <li ng-show="user.username"><a href="/portal/app/store">Store</a></li>
+ <li ng-show="user.admin"><a href="/portal/app/admin">Admin</a></li>
+
+ <li ng-show="user.username"><a ng-click="logout()" href="#">Logout</a></li>
+ <li ng-hide="user.username"><a ng-click="login()" href="#">Login/Register</a></li>
+
+
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/index.html
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/index.html?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/index.html (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/html/portal/index.html Tue Aug 27 18:10:44 2013
@@ -1,2 +1,12 @@
-Hello World.
+<div ng-include="'/portal/static/html/common/partials/navbar.html'"></div>
+
+<div class="container-fluid" id="pageContent">
+
+</div>
+
+<div class="row-fluid">
+
+</div>
+
+<div class="push"></div>
<div ng-include="'/portal/static/html/portal/tabs.html'"></div>
\ No newline at end of file
Added: rave/branches/angular/rave-portal-resources/src/main/webapp/static/images/rave-dark-sm.png
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/images/rave-dark-sm.png?rev=1517903&view=auto
==============================================================================
Binary file - no diff available.
Propchange: rave/branches/angular/rave-portal-resources/src/main/webapp/static/images/rave-dark-sm.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/controllers/NavBarCtrl.js
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/controllers/NavBarCtrl.js?rev=1517903&view=auto
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/controllers/NavBarCtrl.js (added)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/common/controllers/NavBarCtrl.js Tue Aug 27 18:10:44 2013
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+define([], function () {
+ return ['$route', '$scope', function ($route, $scope) {
+
+ $scope.login = function () {
+ alert ('not implemented');
+ }
+
+ $scope.logout = function () {
+ alert ('not implemented');
+ }
+ }]
+});
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/controllers/index.js
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/controllers/index.js?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/controllers/index.js (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/controllers/index.js Tue Aug 27 18:10:44 2013
@@ -17,16 +17,17 @@
* under the License.
*/
-define(['angular', './MainCtrl', './TabsCtrl', './CurrentPageCtrl', './AddOrEditNewPageModalCtrl', './MovePageModalCtrl', 'angularUIBootstrap'],
- function (angular, MainCtrl, TabsCtrl, CurrentPageCtrl, AddOrEditNewPageModalCtrl, MovePageModalCtrl) {
+define(['angular', './MainCtrl', './TabsCtrl', './CurrentPageCtrl', './AddOrEditNewPageModalCtrl',
+ './MovePageModalCtrl', 'common/controllers/NavBarCtrl', 'angularUIBootstrap'],
+ function (angular, MainCtrl, TabsCtrl, CurrentPageCtrl, AddOrEditNewPageModalCtrl, MovePageModalCtrl, NavBarCtrl) {
+ var controllers = angular.module('portal.controllers', ['ui.bootstrap']);
- var controllers = angular.module('portal.controllers', ['ui.bootstrap']);
+ controllers.controller('MainCtrl', MainCtrl);
+ controllers.controller('NavBarCtrl', NavBarCtrl);
+ controllers.controller('TabsCtrl', TabsCtrl);
+ controllers.controller('CurrentPageCtrl', CurrentPageCtrl);
+ controllers.controller('AddOrEditNewPageModalCtrl', AddOrEditNewPageModalCtrl);
+ controllers.controller('MovePageModalCtrl', MovePageModalCtrl);
- controllers.controller('MainCtrl', MainCtrl);
- controllers.controller('TabsCtrl', TabsCtrl);
- controllers.controller('CurrentPageCtrl', CurrentPageCtrl);
- controllers.controller('AddOrEditNewPageModalCtrl', AddOrEditNewPageModalCtrl);
- controllers.controller('MovePageModalCtrl', MovePageModalCtrl);
-
- return controllers;
-});
\ No newline at end of file
+ return controllers;
+ });
\ No newline at end of file
Modified: rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/main.js
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/main.js?rev=1517903&r1=1517902&r2=1517903&view=diff
==============================================================================
--- rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/main.js (original)
+++ rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/portal/main.js Tue Aug 27 18:10:44 2013
@@ -81,4 +81,4 @@ requirejs.config({
require(['angular', 'portal/portal'], function(angular, app){
angular.bootstrap(document, [app.name]);
-});
+});
\ No newline at end of file