# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1430232386 -7200
# Node ID 26cbd84f0493d70a22e40bf25f195b20ed50aba9
# Parent  6c631f531a060d9c3c3d4faab09b402c720f1efa# Parent  2881dd265f21721f57a55c63e56da21b33c74962
Merge stable

diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/public/css/style.css
--- a/kallithea/public/css/style.css	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/public/css/style.css	Tue Apr 28 16:46:26 2015 +0200
@@ -4973,16 +4973,16 @@
     content: "-";
     color: #550000;
 }
- 
+
 table.code-difftable .add .code pre:before {
     content: "+";
     color: #005500;
 }
- 
+
 table.code-difftable .unmod .code pre:before {
     content: " ";
 }
- 
+
 .add-bubble {
     position: relative;
     display: none;
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/changelog/changelog_summary_data.html
--- a/kallithea/templates/changelog/changelog_summary_data.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/changelog/changelog_summary_data.html	Tue Apr 28 16:46:26 2015 +0200
@@ -72,16 +72,6 @@
 
 </table>
 
-<script type="text/javascript">
-  $(document).ready(function(){
-    var $shortlog_data = $('#shortlog_data');
-    $shortlog_data.on('click','.pager_link',function(e){
-      asynchtml(e.target.href, $shortlog_data, function(){tooltip_activate();});
-      e.preventDefault();
-    });
-  });
-</script>
-
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/changeset/changeset_file_comment.html
--- a/kallithea/templates/changeset/changeset_file_comment.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/changeset/changeset_file_comment.html	Tue Apr 28 16:46:26 2015 +0200
@@ -245,7 +245,7 @@
        }
        var post_data = {'text': _text};
        $('#preview-box').addClass('unloaded');
-       $('#preivew-box').html(_TM['Loading ...']);
+       $('#preview-box').html(_TM['Loading ...']);
        $('#edit-container').hide();
        $('#edit-btn').show();
        $('#preview-container').show();
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/followers/followers.html
--- a/kallithea/templates/followers/followers.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/followers/followers.html	Tue Apr 28 16:46:26 2015 +0200
@@ -12,6 +12,7 @@
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
+
 <%def name="main()">
 ${self.repo_context_bar('followers')}
 <div class="box">
@@ -26,4 +27,17 @@
         </div>
     </div>
 </div>
+<script type="text/javascript">
+  $(document).ready(function(){
+    var $followers = $('#followers');
+    $followers.on('click','.pager_link',function(e){
+        asynchtml(e.target.href, $followers, function(){
+            show_more_event();
+            tooltip_activate();
+            show_changeset_tooltip();
+        });
+        e.preventDefault();
+    });
+  });
+</script>
 </%def>
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/followers/followers_data.html
--- a/kallithea/templates/followers/followers_data.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/followers/followers_data.html	Tue Apr 28 16:46:26 2015 +0200
@@ -16,18 +16,5 @@
 % endfor
 
 <div class="pagination-wh pagination-left">
-<script type="text/javascript">
-$(document).ready(function(){
-    var $followers = $('#followers');
-    $followers.on('click','.pager_link',function(e){
-        asynchtml(e.target.href, $followers, function(){
-            show_more_event();
-            tooltip_activate();
-            show_changeset_tooltip();
-        });
-        e.preventDefault();
-    });
-});
-</script>
 ${c.followers_pager.pager('$link_previous ~2~ $link_next')}
 </div>
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/forks/forks.html
--- a/kallithea/templates/forks/forks.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/forks/forks.html	Tue Apr 28 16:46:26 2015 +0200
@@ -27,4 +27,17 @@
         </div>
     </div>
 </div>
+<script type="text/javascript">
+  $(document).ready(function(){
+      var $forks = $('#forks');
+      $forks.on('click','.pager_link',function(e){
+          asynchtml(e.target.href, $forks, function(){
+              show_more_event();
+              tooltip_activate();
+              show_changeset_tooltip();
+          });
+          e.preventDefault();
+      });
+  });
+</script>
 </%def>
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/forks/forks_data.html
--- a/kallithea/templates/forks/forks_data.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/forks/forks_data.html	Tue Apr 28 16:46:26 2015 +0200
@@ -24,19 +24,6 @@
         </div>
     % endfor
   <div class="pagination-wh pagination-left">
-  <script type="text/javascript">
-  $(document).ready(function(){
-      var $forks = $('#forks');
-      $forks.on('click','.pager_link',function(e){
-          asynchtml(e.target.href, $forks, function(){
-              show_more_event();
-              tooltip_activate();
-              show_changeset_tooltip();
-          });
-          e.preventDefault();
-      });
-  });
-  </script>
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}
   </div>
 % else:
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/journal/journal.html
--- a/kallithea/templates/journal/journal.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/journal/journal.html	Tue Apr 28 16:46:26 2015 +0200
@@ -70,7 +70,7 @@
         </div>
     </div>
 
-    <script type="text/javascript">
+<script type="text/javascript">
 
     $('#j_filter').click(function(){
         var $jfilter = $('#j_filter');
@@ -334,5 +334,24 @@
         }
     }
 
-    </script>
+</script>
+
+<script type="text/javascript">
+    $(document).ready(function(){
+        var $journal = $('#journal');
+        $journal.on('click','.pager_link',function(e){
+            asynchtml(e.target.href, $journal, function(){
+                show_more_event();
+                tooltip_activate();
+                show_changeset_tooltip();
+            });
+            e.preventDefault();
+        });
+        $('#journal').on('click','.show_more',function(e){
+            var el = e.target;
+            $('#'+el.id.substring(1)).show();
+            $(el.parentNode).hide();
+        });
+    });
+</script>
 </%def>
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/journal/journal_data.html
--- a/kallithea/templates/journal/journal_data.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/journal/journal_data.html	Tue Apr 28 16:46:26 2015 +0200
@@ -38,24 +38,6 @@
   <div class="pagination-wh pagination-left" style="padding: 0px 0px 0px 10px;">
   ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
   </div>
-    <script type="text/javascript">
-    $(document).ready(function(){
-        var $journal = $('#journal');
-        $journal.on('click','.pager_link',function(e){
-            asynchtml(e.target.href, $journal, function(){
-                show_more_event();
-                tooltip_activate();
-                show_changeset_tooltip();
-            });
-            e.preventDefault();
-        });
-        $('#journal').on('click','.show_more',function(e){
-            var el = e.target;
-            $('#'+el.id.substring(1)).show();
-            $(el.parentNode).hide();
-        });
-    });
-    </script>
 %else:
   <div style="padding:5px 0px 10px 10px;">
       ${_('No entries yet')}
diff -r 6c631f531a06 -r 26cbd84f0493 kallithea/templates/summary/summary.html
--- a/kallithea/templates/summary/summary.html	Wed Apr 22 22:10:11 2015 +0200
+++ b/kallithea/templates/summary/summary.html	Tue Apr 28 16:46:26 2015 +0200
@@ -397,4 +397,15 @@
 </script>
 %endif
 
+## Shortlog paging
+<script type="text/javascript">
+  $(document).ready(function(){
+    var $shortlog_data = $('#shortlog_data');
+    $shortlog_data.on('click','.pager_link',function(e){
+      asynchtml(e.target.href, $shortlog_data, function(){tooltip_activate();});
+      e.preventDefault();
+    });
+  });
+</script>
+
 </%def>