added bootstrap 3.0

scalableminds · Aug 14, 2013 · bdbb13f · bdbb13f
1 parent 737b70a
commit bdbb13f
Show file tree

Hide file tree

Showing 21 changed files with 887 additions and 57 deletions.
diff --git a/app/assets/javascripts/config.coffee b/app/assets/javascripts/config.coffee
@@ -0,0 +1,17 @@
+unless require?
+  requirejs = (config) -> window.require = config
+else
+  requirejs = require
+
+
+requirejs
+
+  baseUrl : "/assets/javascripts"
+
+  paths :
+    "jquery" : "bower_components/jquery/jquery.min"
+    "moment" : "bower_components/momentjs/min/moment.min"
+
+  shim :
+    "moment" :
+      exports : "moment"
diff --git a/app/assets/javascripts/main.coffee b/app/assets/javascripts/main.coffee
@@ -1,16 +1,4 @@
-require.config
-
-  baseUrl : "/assets/javascripts"
-
-  paths :
-    "jquery" : "bower_components/jquery/jquery.min"
-    "moment" : "bower_components/momentjs/min/moment.min"
-
-  shim :
-    "moment" :
-      exports : "moment"
-
-require [
+define [
   "routing"
 ], ->
 
diff --git a/app/assets/javascripts/report.coffee b/app/assets/javascripts/report.coffee
@@ -10,10 +10,10 @@ define ["moment"], ->
     setupUI : ->
 
       #timespan switching
-        $("#date_back").on "click", => 
+        $(".month_picker .month_back").on "click", => 
           @currentDate.subtract("months", 1)
           @loadData()
-        $("#date_forward").on "click", =>
+        $(".month_picker .month_forward").on "click", =>
           @currentDate.add("months", 1)
           @loadData()
 

diff --git a/app/assets/javascripts/routing.coffee b/app/assets/javascripts/routing.coffee
@@ -10,9 +10,7 @@ define ["jquery"], ($) ->
         require ["team_time_report"], (TeamTimeReport) ->
           new TeamTimeReport()
       "^/repos/[a-zA-Z]*/[a-zA-Z]*/issues/[0-9]*/create": ->
-          require ["time_entry"], ->
-
-
+        require ["time_entry"], ->
 
     url = window.location.pathname
 

diff --git a/app/assets/javascripts/team_time_report.coffee b/app/assets/javascripts/team_time_report.coffee
@@ -12,7 +12,7 @@ define ["report"], (Report) ->
 
     loadData : ->
 
-      $("#date").text("#{@currentDate.format('MMMM YYYY')}")
+      $(".month_picker .month_title").text(@currentDate.format('MMMM YYYY'))
       @lastDay = @currentDate.endOf("month").date()
 
       year = @currentDate.format("YYYY")

diff --git a/app/assets/javascripts/user_time_report.coffee b/app/assets/javascripts/user_time_report.coffee
@@ -62,7 +62,7 @@ define ["report"], (Report) ->
 
     loadData :  ->
 
-      $("#date").text("#{@currentDate.format('MMMM YYYY')}")
+      $(".month_picker .month_title").text(@currentDate.format('MMMM YYYY'))
       @lastDay = @currentDate.endOf("month").date()
 
       #DO AJAX CALL

diff --git a/app/assets/stylesheets/main.less b/app/assets/stylesheets/main.less
@@ -13,4 +13,15 @@
   margin-left: 20px;
   margin-right: 20px;
   width: auto;
+}
+
+#user {
+  display: inline;
+  margin: 5px;
+}
+
+.month_picker {
+	.month_title {
+		width: 160px;
+	}
 }
diff --git a/app/views/admin/repositoryAdmin.scala.html b/app/views/admin/repositoryAdmin.scala.html
@@ -3,25 +3,27 @@
 @main("Repository Administration") {
     <div class="container">
     <h3>Add a new repository</h3>
-    @helper.form(controllers.admin.routes.RepositoryAdministration.add, 'class -> "form-horizontal") {
-        <div class="control-group">
-            <label class="control-label" for="inputRepo">Repository</label>
-            <div class="controls">
-                <select name="repository">
+    @helper.form(controllers.admin.routes.RepositoryAdministration.add, 'class -> "form-horizontal", 'role -> "form") {
+        <div class="form-group">
+            <label class="col-lg-2 control-label" for="inputRepo">Repository</label>
+            <div class="col-lg-10">
+                <select name="repository" class="form-control">
                 @availableRepositories.map { repository =>
                     <option value="@repository"> @repository </option>
                 }
                 </select>
             </div>
         </div>
-        <div class="control-group">
-            <label class="control-label" for="inputAccess">Access-Token</label>
-            <div class="controls">
-                <input type="text" id="inputAccess" name="accessToken" required>
+        <div class="form-group">
+            <label class="col-lg-2 control-label" for="inputAccess">Access-Token</label>
+            <div class="col-lg-10">
+                <input class="form-control" type="text" id="inputAccess" name="accessToken" required>
             </div>
         </div>
-        <div class="form-actions">
-            <input type="submit" value="Add" class="btn btn-primary">
+        <div class="form-group">
+            <div class="col-lg-offset-2 col-lg-10">
+                <input type="submit" value="Add" class="btn btn-primary">
+            </div>
         </div>
 
 

diff --git a/app/views/home.scala.html b/app/views/home.scala.html
@@ -4,11 +4,11 @@
    <div class="container wide">
         <div>
             <h2 id="user"></h2>
-            <span class="btn-group">
-                <button class="btn" id="date_back"><i class=" icon-chevron-left"></i></button>
-                <button class="btn" id="date"></button>
-                <button class="btn" id="date_forward"><i class=" icon-chevron-right"></i></button>
-            </span>
+            <div class="btn-group month_picker">
+                <button class="btn btn-default month_back"><i class=" icon-chevron-left"></i></button>
+                <button class="btn btn-default month_title"></button> 
+                <button class="btn btn-default month_forward"><i class=" icon-chevron-right"></i></button>
+            </div>
         </div>
         <div>
             <table id="timetable" class="table table-hover table-bordered">

diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -7,23 +7,32 @@
         <title>@title</title>
         <link rel="stylesheet" media="screen" href="@routes.Assets.at("stylesheets/main.css")">
         <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/bootstrap.min.css")">
+        <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("stylesheets/font-awesome.min.css")">
         <link rel="shortcut icon" type="image/png" href="@routes.Assets.at("images/favicon.png")">
-        <script src="@routes.Assets.at("javascripts/bower_components/requirejs/require.js")" type="text/javascript"></script>
-        <script src="@routes.Assets.at("javascripts/main.js")" type="text/javascript"></script>
+        <script src="@routes.Assets.at("javascripts/config.js")" type="text/javascript"></script>
+        <script src="@routes.Assets.at("javascripts/bower_components/requirejs/require.js")" data-main="main" type="text/javascript"></script>
     </head>
     <body>
-        <div class="navbar navbar-fixed-top navbar-inverse">
-            <div class="navbar-inner">
-                <div class="container">
-                    <a class="brand" href="@controllers.routes.Application.home">Time-Tracker</a>
-                    <ul class="nav">
+        <header class="navbar" role="banner">
+            <div class="container">
+                <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="@controllers.routes.Application.home">Time-Tracker</a>
+                </div>
+                <div class="collapse navbar-collapse navbar-ex1-collapse">
+                    <ul class="nav navbar-nav">
                         <li class="active"><a href="@controllers.routes.Application.home">Home</a></li>
                         <li><a href="@controllers.routes.Application.team">Team</a></li>
                         <li><a href="@controllers.admin.routes.RepositoryAdministration.list">Admin</a></li>
                     </ul>
                 </div>
             </div>
-        </div>
+        </header>
         <div id="main-container">
         @content
         </div>

diff --git a/app/views/team.scala.html b/app/views/team.scala.html
@@ -4,11 +4,11 @@
    <div class="container wide">
         <div>
             <h2 id="user">Team Overview</h2>
-            <span class="btn-group">
-                <button class="btn" id="date_back"><i class=" icon-chevron-left"></i></button>
-                <button class="btn" id="date"></button>
-                <button class="btn" id="date_forward"><i class=" icon-chevron-right"></i></button>
-            </span>
+            <div class="btn-group month_picker">
+                <button class="btn btn-default month_back"><i class=" icon-chevron-left"></i></button>
+                <button class="btn btn-default month_title"></button>
+                <button class="btn btn-default month_forward"><i class=" icon-chevron-right"></i></button>
+            </div>
         </div>
         <div>
             <table id="timetable" class="table table-hover table-striped table-bordered">

diff --git a/public/font/FontAwesome.otf b/public/font/FontAwesome.otf
diff --git a/public/font/fontawesome-webfont.eot b/public/font/fontawesome-webfont.eot