Merge branch 'testacular' of mjesec.ffzg.hr:/git/angular-drzb into testacular

[angular-drzb] / app / drzb2013.html.ep
diff --git a/app/drzb2013.html.ep b/app/drzb2013.html.ep

index 712c77d..9d089fb 100644 (file)
--- a/app/drzb2013.html.ep
+++ b/app/drzb2013.html.ep
@@ -1,5 +1,6 @@
  <!doctype html>
-<html lang="<%= $lang %>" ng-app="myApp" xmlns:ng="http://angularjs.org">
+% my $test = param('test');
+<html lang="<%= $lang %>" ng-app="<%= $test ? 'testApp' : 'myApp' %>" xmlns:ng="http://angularjs.org">
  <head>
    <meta charset="utf-8">
    <title><%= locale
@@ -7,6 +8,11 @@
         hr => 'Registracija za konferenciju'
    %></title>
  
+% if ( $lang !~ m/-dev/ ) {
+%#  <link rel="shortcut icon" href="/drzb2013/drzb2013.ico"> 
+  <link rel="shortcut icon" href="/drzb2013/drzb2013.png"> 
+% }
+
    <!-- Twtitter bootstrap -->
    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" />
    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap-responsive.min.css" />
@@ -14,6 +20,11 @@
    <link rel="stylesheet" href="/css/app.css"/>
    <link rel="stylesheet" href="/css/drzb2013.css"/>
  
+       <!--[if IE 7]>
+               <script src="scripts/vendor/es5-shim.min.js"></script>
+               <script src="scripts/vendor/json3.min.js"></script>
+       <![endif]-->
+
      <!--[if lte IE 8]>
        <script>
          document.createElement('ng-include');
@@ -30,11 +41,22 @@
  </head>
  <body>
  
-% if ( param('admin') ) {
-  <ul class="menu">
-    <li><a href="#/registration">registation</a></li>
-    <li><a href="#/list">list</a></li>
+% if ( $lang =~ m/-dev/ ) {
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+  <ul class="nav">
+    <li data-match-route="/registration"><a href="#/registration">registation</a></li>
+    <li data-match-route="/list"><a href="#/list">list</a></li>
+    <li class="divider-vertical"></li>
    </ul>
+  <div class="brand"><span app-version></span></div>
+ </div>
+</div>
+<style type="text/css">
+body {
+       margin-top: 3em;
+}
+</style>
  % }
  
    <!--[if lt IE 8]>
@@ -53,18 +75,26 @@
  %= include( "drzb2013/header.$lang" );
  
    <div class="container" ng-view></div>
-<!--
-  <div>Angular seed app: v<span app-version></span></div>
--->
+  <script src="/lib/jquery/1.8.3/jquery.min.js"></script>
+  <script src="/lib/bootstrap/js/bootstrap.min.js"></script>
    <!-- In production use:
    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"></script>
    -->
    <script src="/lib/angular/angular.js"></script>
    <script src="/lib/angular/angular-resource.js"></script>
+
+  <script src="/js/pagination.js"></script>
+
    <script src="/js/app.js"></script>
    <script src="/js/services.js"></script>
    <script src="/js/controllers.js"></script>
    <script src="/js/filters.js"></script>
    <script src="/js/directives.js"></script>
+
+% if ( $test ) {
+  <script src="/test/lib/angular/angular-mocks.js"></script>
+  <script src="/js/testApp.js"></script>
+% }
+
  </body>
  </html>