You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/08/06 14:25:35 UTC
svn commit: r1616194 [1/8] - in
/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp: ./
js/ js/app/ js/app/controllers/ js/app/directives/ js/app/filters/
js/app/services/ partials/
Author: olamy
Date: Wed Aug 6 12:25:34 2014
New Revision: 1616194
URL: http://svn.apache.org/r1616194
Log:
adding structure for angular with requirejs
Added:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-1.2.21.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-1.3.0-beta.16.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-1.3.0-beta.16.min.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-resource-1.2.21.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-resource-1.3.0-beta.16.min.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-route-1.2.21.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-route-1.3.0-beta.16.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angular-route-1.3.0-beta.16.min.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/angularAMD-0.2.0-rc.1.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/directives/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/directives/directives.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/filters/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/filters/filters.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/services/services.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/main.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/require-2.1.14.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/home.html (with props)
Modified:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html?rev=1616194&r1=1616193&r2=1616194&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html Wed Aug 6 12:25:34 2014
@@ -24,43 +24,47 @@
<body>
- <div id="wrapper">
+ <div id="wrapper">
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="http://sirona.incubator.apache.org/">Sirona</a>
- </div>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="http://sirona.incubator.apache.org/">Sirona</a>
+ </div>
+
+ <div class="collapse navbar-collapse navbar-ex1-collapse">
+ <ul class="nav navbar-nav side-nav" id="plugins">
+ <li class="active">
+ <li>
+ <a href="$mapping/">Home</a>
+ </li>
+ <li class="active">
+ <li>
+ <a href="$mapping$plugin.url">$plugin.name</a>
+ </li>
+ </ul>
+
+ <ul class="nav navbar-nav navbar-right navbar-user">
+ <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
+ </ul>
+ </div>
+ </nav>
- <div class="collapse navbar-collapse navbar-ex1-collapse">
- <ul class="nav navbar-nav side-nav" id="plugins">
- <li class="active">
- <li>
- <a href="$mapping/">Home</a>
- </li>
- <li class="active">
- <li>
- <a href="$mapping$plugin.url">$plugin.name</a>
- </li>
- </ul>
-
- <ul class="nav navbar-nav navbar-right navbar-user">
- <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
- </ul>
- </div>
- </nav>
+ <div id="page-wrapper" ng-view>
+ Foo
+ </div>
- <div id="page-wrapper">
- Foo
</div>
- </div>
-
</body>
-</html>
\ No newline at end of file
+
+ <script type="text/javascript" src="js/jquery-1.11.0.js"></script>
+ <script type="text/javascript" data-main="js/main.js" src="js/require-2.1.14.js"></script>
+
+</html>