kallithea Changeset - 26cbd84f0493

Changeset - 26cbd84f0493

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 10 0

Mads Kiilerich - 11 years ago 2015-04-28 16:46:26
madski@unity3d.com

Merge stable

10 files changed with 63 insertions and 60 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/followers/followers.html

kallithea/templates/followers/followers_data.html

kallithea/templates/forks/forks.html

kallithea/templates/forks/forks_data.html

kallithea/templates/journal/journal.html

kallithea/templates/journal/journal_data.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4973,16 +4973,16 @@ table.code-difftable .del .code pre:befo @@
     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;

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -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>

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -245,7 +245,7 @@ $(document).ready(function () { @@
+       }
        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();

kallithea/templates/followers/followers.html

➞

Show inline comments

@@ @@ -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 @@ ${self.repo_context_bar('followers')} @@
         </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>

kallithea/templates/followers/followers_data.html

➞

Show inline comments

@@ @@ -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>

kallithea/templates/forks/forks.html

➞

Show inline comments

@@ @@ -27,4 +27,17 @@ ${self.repo_context_bar('showforks')} @@
         </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>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -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:

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -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>

kallithea/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -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')}

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -397,4 +397,15 @@ $(document).ready(function(){ @@
 </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>

0 comments (0 inline, 0 general)