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

@@ @@ -4970,22 +4970,22 @@ table.code-difftable .code pre { @@
+}
 table.code-difftable .del .code pre:before {
     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;
     float: left;
     width: 0px;
     height: 0px;

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -69,22 +69,12 @@ @@
         </td>
     </tr>
 %endfor
 </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>
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -242,13 +242,13 @@ $(document).ready(function () { @@
        var _text = $('#text').val();
        if(!_text){
            return;
+       }
        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();
        $('#preview-btn').hide();
        var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});

kallithea/templates/followers/followers.html

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ @@
     ${_('Followers')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('followers')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
@@ @@ -23,7 +24,20 @@ ${self.repo_context_bar('followers')} @@
     <div class="table">
         <div id="followers">
             <%include file='followers_data.html'/>
         </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

@@ @@ -13,21 +13,8 @@ @@
         <span class="tooltip" title="${h.tooltip(f.follows_from)}"> ${h.age(f.follows_from)}</span></div>
         <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
     </div>
 % 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

@@ @@ -24,7 +24,20 @@ ${self.repo_context_bar('showforks')} @@
     <div class="table">
         <div id="forks">
             <%include file='forks_data.html'/>
         </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

@@ @@ -21,24 +21,11 @@ @@
                    class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </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:
     ${_('There are no forks yet')}
 % endif

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ @@
         <div id="watched_container">
             <div class="table-grid table yui-skin-sam" id="watched_repos_list_wrap"></div>
             <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
     </div>
-    <script type="text/javascript">
 <script type="text/javascript">
     $('#j_filter').click(function(){
         var $jfilter = $('#j_filter');
         if($jfilter.hasClass('initial')){
             $jfilter.val('');
+        }
@@ @@ -331,8 +331,27 @@ @@
         if($('#q_filter').val()) {
             updateFilter();
+        }
+    }
     </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

@@ @@ -35,29 +35,11 @@ @@
         %endfor
     %endfor
   <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')}
   </div>
 %endif

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -394,7 +394,18 @@ $(document).ready(function(){ @@
         $('#code_stats_show_more').hide();
     });
 });
 </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)