Merge branch 'develop' of https://github.com/Schosser/MasterLabProjec…

…t09_2013 into develop
kujta1 · Feb 21, 2014 · d0de88c · d0de88c
2 parents 752893c + 064b558
commit d0de88c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/website/app/views/VideoController/index.html b/website/app/views/VideoController/index.html
@@ -24,8 +24,8 @@
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown">Date<b class="caret"></b></a>
 					<ul class="dropdown-menu">
 						<li>
-                            <div class="input-group date datepicker" id="datepicker" data-date="23.02.2014" data-date-format="dd.mm.yyyy">
-                                <input class="form-control" name="pickedDate" id="pickedDate" type="text" value="23.02.2014">
+                            <div class="input-group date datepicker" id="datepicker" data-date="24.02.2014" data-date-format="dd.mm.yyyy">
+                                <input class="form-control" name="pickedDate" id="pickedDate" type="text" value="24.02.2014">
                                 <span class="input-group-addon">
                                     <i class="glyphicon glyphicon-calendar"></i>
                                 </span>

diff --git a/website/app/views/header.html b/website/app/views/header.html
@@ -13,7 +13,7 @@
         <li>
             <form class="navbar-form navbar-left search-form" role="search" method="POST"  action="@{VideoController.search}" >
               <div class="form-group">
-                <input type="text" id="query" value="${params.query}" name="query" class="form-control search" placeholder="Search">
+                <input type="text" id="query" value="${params.query}" name="query" class="form-control search" placeholder="Search ...">
               </div>
               <button type="submit" class="btn btn-default">Search</button>
               <button class="btn btn-danger new-video" type="button" data-toggle="modal" data-target="#addVideo">

diff --git a/website/public/js/timeline.js b/website/public/js/timeline.js
@@ -41,6 +41,10 @@ function flipMainPanel() {
                 } else {
                     addNoteTime = currentPeriodStart;
                 }
+            },
+            onReverseFinish:function(){
+                initNoteFlip();
+                initManualSlideButtons();
             }
         });
         mainPanelFlipped = true;
@@ -114,7 +118,6 @@ function revertOptionsFlip() {
         }
     });
     optionsFlipped = false;
-
 }
 
 function prettifyNoteContent(title, content, user) {
@@ -303,6 +306,8 @@ function syncTimelineWithVideo() {
     $('#syncText').html("<div class='alert alert-success'><span class='glyphicon glyphicon-check'></span> Timeline is syncronized with the video</div>");
     timelineIsSynced = true;
     changeDisplayPeriodToTime();
+    $('.note').remove();
+    updateTimeline(lastVideoUpdate);
 }
 
 function asyncTimelineUpdate() {