kallithea Changeset - df5b6fc6c518

@@ @@ -2050,25 +2050,25 @@ var YUI_paginator = function(links_per_p @@
     var pagi = new YAHOO.widget.Paginator({
         rowsPerPage: links_per_page,
         alwaysVisible: false,
         template : "{PreviousPageLink} {MyFirstPageLink} {PageLinks} {MyLastPageLink} {NextPageLink}",
         pageLinks: 5,
         containerClass: 'pagination-wh',
         currentPageClass: 'pager_curpage',
         pageLinkClass: 'pager_link',
         nextPageLinkLabel: '&gt;',
         previousPageLinkLabel: '&lt;',
         containers:containers
     })
+    });
     return pagi
+}
 var YUI_datatable = function(data, fields, columns, countnode, sortkey, rows){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: fields
         };
     myDataSource.doBeforeCallback = function(req, raw, res, cb) {

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -155,20 +155,20 @@ @@
                     url: "${h.url('edit_gist_check_revision', gist_id=c.gist.gist_access_id)}",
                     data: {'revision': '${c.file_changeset.raw_id}'},
                     dataType: 'json',
                     type: 'POST',
                     success: function(data) {
                       if(data.success == false){
                           $('#edit_error').show();
+                      }
                       else{
                         $('#eform').submit();
+                      }
+                    }
                   })
+                  });
               });
           </script>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

@@ @@ -70,14 +70,14 @@ @@
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#lifetime").select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>

kallithea/templates/admin/my_account/my_account_repos.html

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ function table_renderer(data){ @@
             {key:"action"}
+            ]
         };
     myDataSource.doBeforeCallback = function(req,raw,res,cb) {
         // This is the filter function
         var data     = res.results || [],
             filtered = [],
             i,l;
         if (req) {
             req = req.toLowerCase();
             for (i = 0; i<data.length; i++) {
                 var pos = data[i].raw_name.toLowerCase().indexOf(req)
+                var pos = data[i].raw_name.toLowerCase().indexOf(req);
                 if (pos != -1) {
                     filtered.push(data[i]);
+                }
+            }
             res.results = filtered;
+        }
         return res;
+    }
       // main table sorting
       var myColumnDefs = [
           {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},

kallithea/templates/admin/my_account/my_account_watched.html

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ function table_renderer(data){ @@
             {key:"action"}
+            ]
         };
     myDataSource.doBeforeCallback = function(req,raw,res,cb) {
         // This is the filter function
         var data     = res.results || [],
             filtered = [],
             i,l;
         if (req) {
             req = req.toLowerCase();
             for (i = 0; i<data.length; i++) {
                 var pos = data[i].raw_name.toLowerCase().indexOf(req)
+                var pos = data[i].raw_name.toLowerCase().indexOf(req);
                 if (pos != -1) {
                     filtered.push(data[i]);
+                }
+            }
             res.results = filtered;
+        }
         return res;
+    }
       // main table sorting
       var myColumnDefs = [
           {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},

kallithea/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -39,16 +39,16 @@ @@
         %if c.notification.body:
             ${h.rst_w_mentions(c.notification.body)}
         %endif
         </div>
       </div>
     </div>
 </div>
 <script type="text/javascript">
 var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var main = "${url('notifications')}";
    $('.delete-notification').click(function(e){
        var notification_id = e.currentTarget.id;
        deleteNotification(url,notification_id,[function(){window.location=main}])
+       deleteNotification(url,notification_id,[function(){window.location=main}]);
    });
 </script>
 </%def>

kallithea/templates/admin/repo_groups/repo_group_add.html

➞

Show inline comments

@@ @@ -67,29 +67,29 @@ @@
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show()
+                $('#copy_perms').show();
+            }
             else{
                 $('#copy_perms').hide();
+            }
+        }
         $("#group_parent_id").select2({
             'dropdownAutoWidth': true
         });
         setCopyPermsOption($('#group_parent_id').val())
+        setCopyPermsOption($('#group_parent_id').val());
         $("#group_parent_id").on("change", function(e) {
             setCopyPermsOption(e.val)
         })
             setCopyPermsOption(e.val);
         });
         $('#group_name').focus();
     })
+    });
 </script>
 </%def>

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

➞

Show inline comments

 <div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('Repository Group: %s') % c.repo_group.group_name}</div>
 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Top level repositories'), c.repo_group.repositories.count(), ''),
     (_('Total repositories'), c.repo_group.repositories_recursive_count, ''),
     (_('Children groups'), c.repo_group.children.count(), ''),
     (_('Created on'), h.fmt_date(c.repo_group.created_on), ''),
     (_('Owner'), h.person(c.repo_group.user), '')
+    (_('Owner'), h.person(c.repo_group.user), ''),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('repos_group', group_name=c.repo_group.group_name),method='delete')}
     <button class="btn btn-small btn-danger" type="submit"
             onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository',
           'Confirm to delete this group: %s with %s repositories',

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

@@ @@ -52,14 +52,14 @@ ${h.form(url('delete_repo_group', group_ @@
         <div class="field" style="border:none;color:#888">
             ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn red",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
         </div>
     </div>
 </div>
 ${h.end_form()}
 <script>
     $(document).ready(function(){
         $("#group_parent_id").select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -81,48 +81,48 @@ ${h.form(url('repos'))} @@
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
         </div>
         <div class="buttons">
           ${h.submit('add',_('Add'),class_="btn")}
         </div>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show()
+                $('#copy_perms').show();
+            }
             else{
                 $('#copy_perms').hide();
+            }
+        }
         $('#remote_clone_toggle').on('click', function(e){
             $('#remote_clone').show();
             e.preventDefault();
         })
+        });
         if($('#remote_clone input').hasClass('error')){
             $('#remote_clone').show();
+        }
         if($('#remote_clone input').val()){
             $('#remote_clone').show();
+        }
         $("#repo_group").select2({
             'dropdownAutoWidth': true
         });
         setCopyPermsOption($('#repo_group').val())
+        setCopyPermsOption($('#repo_group').val());
         $("#repo_group").on("change", function(e) {
             setCopyPermsOption(e.val)
         })
             setCopyPermsOption(e.val);
         });
         $("#repo_type").select2({
             'minimumResultsForSearch': -1
         });
         $("#repo_landing_rev").select2({
             'minimumResultsForSearch': -1
         });
         $('#repo_name').focus();
     })
+    });
 </script>
 ${h.end_form()}

kallithea/templates/admin/repos/repo_creating.html

➞

Show inline comments

@@ @@ -48,19 +48,19 @@ @@
     success: function(data) {
       if(data.result === true){
           //redirect to created fork if our ajax loop tells us to do so.
           window.location = "${h.url('summary_home', repo_name = c.repo)}";
+      }
     },
     complete: function(resp, status) {
       if (resp.status == 200){
           // Schedule the next request when the current one's complete
           setTimeout(worker, 1000);
+      }
       else{
           $("#progress").html($('#progress_error').html())
+          $("#progress").html($('#progress_error').html());
+      }
+    }
   });
 })();
 </script>
 </%def>

kallithea/templates/admin/repos/repo_edit_advanced.html

➞

Show inline comments

@@ @@ -7,25 +7,25 @@ ${h.form(url('edit_repo_advanced_fork', @@
        <ul>
             <li>${_('''Manually set this repository as a fork of another from the list.''')}</li>
        </ul>
        </div>
 </div>
 ${h.end_form()}
 <script>
     $(document).ready(function(){
         $("#id_fork_of").select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>
 <h3>${_('Public Journal Visibility')}</h3>
 ${h.form(url('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='put')}
 <div class="form">
   <div class="field">
   %if c.in_public_journal:
     <button class="btn btn-small" type="submit">
         <i class="icon-minus"></i>
         ${_('Remove from public journal')}
     </button>
   %else:

kallithea/templates/admin/repos/repo_edit_fork.html

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ ${h.form(url('repo_as_fork', repo_name=c @@
        <ul>
             <li>${_('''Manually set this repository as a fork of another from the list.''')}</li>
        </ul>
        </div>
 </div>
 ${h.end_form()}
 <script>
     $(document).ready(function(){
         $("#id_fork_of").select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -134,31 +134,31 @@ ${h.form(url('repo', repo_name=c.repo_in @@
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 <script>
     $(document).ready(function(){
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         })
+        });
         $('#edit_clone_uri').on('click', function(e){
           $('#alter_clone_uri').show();
           $('#edit_clone_uri').hide();
           $('#clone_uri_hidden').hide();
           ## store hash of old value for change detection
           var uri_change =  '<input id="clone_uri_change" name="clone_uri_change" type="hidden" value="${h.md5(c.repo_info.clone_uri or "").hexdigest()}" />';
           $('#alter_clone_uri_help_block').html($('#alter_clone_uri_help_block').html()+" ("+$('#clone_uri_hidden_value').html()+")")
         })
           $('#alter_clone_uri_help_block').html($('#alter_clone_uri_help_block').html()+" ("+$('#clone_uri_hidden_value').html()+")");
         });
         $('#repo_landing_rev').select2({
             'dropdownAutoWidth': true
         });
         $('#repo_group').select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>

kallithea/templates/admin/settings/settings_email.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     (_('Email prefix'), c.ini.get('email_prefix'), ''),
     (_('Kallithea email from'), c.ini.get('app_email_from'), ''),
     (_('Error email from'), c.ini.get('error_email_from'), ''),
     (_('Error email recipients'), c.ini.get('email_to'), ''),
     (_('SMTP server'), c.ini.get('smtp_server'), ''),
     (_('SMTP username'), c.ini.get('smtp_username'), ''),
     (_('SMTP password'), '%s chars' % len(c.ini.get('smtp_password', '')), ''),
     (_('SMTP port'), c.ini.get('smtp_port'), ''),
     (_('SMTP use TLS'), c.ini.get('smtp_use_tls'), ''),
     (_('SMTP use SSL'), c.ini.get('smtp_use_ssl'), ''),
     (_('SMTP auth'), c.ini.get('smtp_auth'), '')
+    (_('SMTP auth'), c.ini.get('smtp_auth'), ''),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(url('admin_settings_email'), method='post')}
     <div class="form">
         <div class="fields">

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Kallithea version'), h.literal('%s <b><span style="color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
     (_('Python version'), c.py_version, ''),
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
     (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), '')
+    (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+ ]
 %>
 <div id="update_notice" style="display: none">
     <div style="padding: 5px 0px 5px 0px; color: #000000; font-weight: bold">${_('Checking for updates...')}</div>
 </div>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -82,15 +82,15 @@ ${h.form(url('admin_settings'), method=' @@
            </div>
         </div>
     </div>
     ${h.end_form()}
     <script type="text/javascript">
         $(document).ready(function(){
             $('#path_unlock').on('click', function(e){
                 $('#path_unlock_icon').removeClass('icon-lock');
                 $('#path_unlock_icon').addClass('icon-lock-open-alt');
                 $('#paths_root_path').removeAttr('readonly');
                 $('#paths_root_path').removeClass('disabled');
             })
         })
             });
         });
     </script>

kallithea/templates/admin/user_groups/user_group_add.html

➞

Show inline comments

@@ @@ -55,15 +55,15 @@ @@
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $('#users_group_name').focus();
     })
+    });
 </script>
 </%def>

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

➞

Show inline comments

 <div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('User Group: %s') % c.user_group.users_group_name}</div>
 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Members'), len(c.group_members_obj), ''),
     (_('Created on'), h.fmt_date(c.user_group.created_on), ''),
     (_('Owner'), h.person(c.user_group.user), '')
+    (_('Owner'), h.person(c.user_group.user), ''),
+    ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('users_group', id=c.user_group.users_group_id),method='delete')}
     <button class="btn btn-small btn-danger" type="submit"
             onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');">
         <i class="icon-minus-circled"></i>

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -94,15 +94,15 @@ @@
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $('#username').focus();
     })
+    });
 </script>
 </%def>

kallithea/templates/admin/users/user_edit_advanced.html

➞

Show inline comments

 <div style="font-size: 24px; color: #666666; padding: 0px 0px 10px 0px">${_('User: %s') % c.user.username}</div>
 <dl class="dl-horizontal">
 <%
  elems = [
     (_('Repositories'), len(c.user.repositories), ', '.join((x.repo_name for x in c.user.repositories))),
     (_('Source of Record'), c.user.extern_type, ''),
     (_('Created on'), h.fmt_date(c.user.created_on), ''),
     (_('Last Login'), c.user.last_login or '-', ''),
     (_('Member of User groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member)))
+    (_('Member of User groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_user', id=c.user.user_id),method='delete')}
     <button class="btn btn-small btn-danger" type="submit"
             onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');">
         <i class="icon-minus-circled"></i>

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -70,14 +70,14 @@ @@
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#lifetime").select2({
             'dropdownAutoWidth': true
         });
     })
+    });
 </script>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -410,58 +410,58 @@ @@
             },
             query: function(query){
               var key = 'cache';
               var cached = cache[key] ;
               if(cached) {
                 var data = {results: []};
                 //filter results
                 $.each(cached.results, function(){
                     var section = this.text;
                     var children = [];
                     $.each(this.children, function(){
                         if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                             children.push({'id': this.id, 'text': this.text, 'type': this.type, 'obj': this.obj})
+                            children.push({'id': this.id, 'text': this.text, 'type': this.type, 'obj': this.obj});
+                        }
                     })
+                    });
                     if(children.length !== 0){
                         data.results.push({'text': section, 'children': children})
+                        data.results.push({'text': section, 'children': children});
+                    }
                 });
                 query.callback(data);
               }else{
                   $.ajax({
                     url: "${h.url('repo_switcher_data')}",
                     data: {},
                     dataType: 'json',
                     type: 'GET',
                     success: function(data) {
                       cache[key] = data;
                       query.callback({results: data.results});
+                    }
                   })
+                  });
+              }
+            }
         });
         $("#repo_switcher").on('select2-selecting', function(e){
             e.preventDefault();
             window.location = pyroutes.url('summary_home', {'repo_name': e.val})
         })
             window.location = pyroutes.url('summary_home', {'repo_name': e.val});
         });
         ## Global mouse bindings ##
         // general help "?"
         Mousetrap.bind(['?'], function(e) {
             $('#help_kb').modal({})
+            $('#help_kb').modal({});
         });
         // / open the quick filter
         Mousetrap.bind(['/'], function(e) {
             $("#repo_switcher").select2("open");
             // return false to prevent default browser behavior
             // and stop event from bubbling
             return false;
         });
         // ctrl/command+b, show the the main bar
@@ @@ -535,25 +535,25 @@ @@
                   <tr>
                     <th></th>
                     <th>${_('Site-wide shortcuts')}</th>
                   </tr>
                   <%
                      elems = [
                          ('/', 'Open quick search box'),
                          ('ctrl/cmd+b', 'Show main settings bar'),
                          ('g h', 'Goto home page'),
                          ('g g', 'Goto my private gists page'),
                          ('g G', 'Goto my public gists page'),
                          ('n r', 'New repository page'),
                          ('n g', 'New gist page')
+                         ('n g', 'New gist page'),
+                     ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
                   </table>
@@ @@ -563,25 +563,25 @@ @@
                 <tbody>
                   <tr>
                     <th></th>
                     <th>${_('Repositories')}</th>
                   </tr>
                   <%
                      elems = [
                          ('g s', 'Goto summary page'),
                          ('g c', 'Goto changelog page'),
                          ('g f', 'Goto files page'),
                          ('g F', 'Goto files page with file search activated'),
                          ('g o', 'Goto repository settings'),
                          ('g O', 'Goto repository permissions settings')
+                         ('g O', 'Goto repository permissions settings'),
+                     ]
                   %>
                   %for key, desc in elems:
                   <tr>
                     <td class="keys">
                       <span class="key">${key}</span>
                     </td>
                     <td>${desc}</td>
                   </tr>
                 %endfor
                 </tbody>
             </table>

kallithea/templates/base/default_perms_box.html

➞

Show inline comments

@@ @@ -74,16 +74,16 @@ $(document).ready(function(e){ @@
     var show_custom_perms = function(inherit_default){
         if(inherit_default){
             $('#inherit_overlay').hide();
         }else{
             $('#inherit_overlay').show();
+        }
     };
     show_custom_perms($('#inherit_default_permissions').prop('checked'));
     $('#inherit_default_permissions').change(function(){
         show_custom_perms($('#inherit_default_permissions').prop('checked'));
     });
 })
+});
 </script>
 </%def>

kallithea/templates/base/perms_summary.html

➞

Show inline comments

@@ @@ -114,15 +114,15 @@ @@
                 var checked = $checkbox.prop('checked');
                 if(checked){
                     $('.'+section+'_'+perm_type).show();
+                }
                 else{
                     $('.'+section+'_'+perm_type).hide();
+                }
             });
             show_empty(section);
+        }
         $('.perm_filter').on('change', function(){update_show($(this));});
         $('.perm_filter[value=none]').each(function(){this.checked = false; update_show($(this));});
     })
+    });
 </script>
 </%def>

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -201,25 +201,25 @@ ${self.repo_context_bar('changelog', c.f @@
                             : _TM['Show Selected Changesets __S &rarr; __E'];
                         link = link.replace('__S',rev_start.substr(0,6));
                         link = link.replace('__E',rev_end.substr(0,6));
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
                         YUD.setStyle('rev_range_clear','display','');
                         YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                    {'repo_name': '${c.repo_name}',
                                                                     'rev_start': rev_start,
                                                                     'rev_end': rev_end})
+                                                                    'rev_end': rev_end});
                         YUD.setStyle('compare_fork','display','none');
                     }else{
                         YUD.setStyle('rev_range_container','display','none');
                         YUD.setStyle('rev_range_clear','display','none');
                         %if c.revision:
                             YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                        {'repo_name': '${c.repo_name}',
                                                                         'rev_end':'${c.first_revision.raw_id}'});
                         %else:
                             YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                        {'repo_name': '${c.repo_name}',

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -237,25 +237,25 @@ ${self.repo_context_bar('changelog', c.c @@
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));
                           _html +='<br/>'
                           _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));
                           $('#child_link').html(_html);
+                      }
+                    }
                   });
               e.preventDefault();
+              }
           })
+          });
           //prev links
           $('#parent_link').on('click', function(e){
               //fetch via ajax what is going to be the next link, if we have
               //>1 links show them to user to choose
               if(!$('#parent_link').hasClass('disabled')){
                   $.ajax({
                     url: '${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}',
                     success: function(data) {
                       if(data.results.length === 0){
                           $('#parent_link').addClass('disabled');
                           $('#parent_link').html('${_('No revisions')}');
@@ @@ -280,18 +280,18 @@ ${self.repo_context_bar('changelog', c.c @@
                           $('#parent_link').html(_html);
+                      }
+                    }
                   });
               e.preventDefault();
+              }
           });
           // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload
           if (window.location.hash != "") {
               window.location.href = window.location.href;
+          }
       })
+      });
     </script>
     </div>
 </%def>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -104,84 +104,84 @@ ${self.repo_context_bar('changelog')} @@
         dropdownAutoWidth: true,
         query: function(query){
           var key = 'cache';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push({'id': this.id, 'text': this.text})
+                        children.push({'id': this.id, 'text': this.text});
+                    }
                 })
                 data.results.push({'text': section, 'children': children})
                 });
                 data.results.push({'text': section, 'children': children});
             });
             //push the typed in changeset
             data.results.push({'text':_TM['Specify changeset'],
                                'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})
+                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]});
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.a_repo.repo_name}'}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback(data);
+                }
               })
+              });
+          }
+        }
     });
     $("#compare_other").select2({
         placeholder: "${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}",
         dropdownAutoWidth: true,
         formatSelection: function(obj){
             return '{0}@{1}'.format("${c.cs_repo.repo_name}", obj.text)
+            return '{0}@{1}'.format("${c.cs_repo.repo_name}", obj.text);
         },
         query: function(query){
           var key = 'cache2';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push({'id': this.id, 'text': this.text})
+                        children.push({'id': this.id, 'text': this.text});
+                    }
                 })
                 data.results.push({'text': section, 'children': children})
                 });
                 data.results.push({'text': section, 'children': children});
             });
             //push the typed in changeset
             data.results.push({'text':_TM['Specify changeset'],
                                'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]})
+                               'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]});
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.cs_repo.repo_name}'}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback({results: data.results});
+                }
               })
+              });
+          }
+        }
     });
     var values_changed = function() {
         var values = $('#compare_org').select2('data') && $('#compare_other').select2('data');
         if (values) {
              $('#compare_revs').removeClass("disabled");
              // TODO: the swap button ... if any
         } else {
              $('#compare_revs').addClass("disabled");
              // TODO: the swap button ... if any

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -66,44 +66,44 @@ var orig1_url = '${h.url('files_raw_home @@
 var orig2_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node2.path),revision=c.cs2.raw_id)}';
 $(document).ready(function () {
     $('#compare').mergely({
         width: 'auto',
         height: '600',
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
         cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
         lhs: function(setValue) {
             if("${c.node1.is_binary}" == "True"){
                 setValue('Binary file')
+                setValue('Binary file');
+            }
             else{
                 $.ajax(orig1_url, {dataType: 'text', success: setValue});
+            }
         },
         rhs: function(setValue) {
             if("${c.node2.is_binary}" == "True"){
                 setValue('Binary file')
+                setValue('Binary file');
+            }
             else{
                 $.ajax(orig2_url, {dataType: 'text', success: setValue});
+            }
+        }
     });
     $('#ignorews').change(function(e){
         var val = e.currentTarget.checked;
         $('#compare').mergely('options', {ignorews: val});
         $('#compare').mergely('update');
     })
+    });
     $('#edit_mode').change(function(e){
         var val = !e.currentTarget.checked;
         $('#compare').mergely('cm', 'lhs').setOption('readOnly', val);
         $('#compare').mergely('cm', 'rhs').setOption('readOnly', val);
         $('#compare').mergely('update');
     })
+    });
 });
 </script>
 </div>
 </%def>

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -55,28 +55,28 @@ pyroutes.register('files_authors_home', @@
 var ypjax_links = function(){
     $('.ypjax-link').click(function(e){
         //don't do ypjax on middle click
         if(e.which == 2 || !History.enabled){
             return true;
+        }
         var el = e.currentTarget;
         var url = el.href;
         var _base_url = '${h.url("files_home",repo_name=c.repo_name,revision='',f_path='')}';
         _base_url = _base_url.replace('//','/')
+        _base_url = _base_url.replace('//','/');
         //extract rev and the f_path from url.
         parts = url.split(_base_url)
+        parts = url.split(_base_url);
         if(parts.length != 2){
             return false;
+        }
         var parts2 = parts[1].split('/');
         var rev = parts2.shift(); // pop the first element which is the revision
         var f_path = parts2.join('/');
         //page title - make this consistent with title mako block above
         var title = "${_('%s Files') % c.repo_name}" + " \u00B7 " + (f_path || '/') + " \u00B7 " + "${c.site_name}";
         var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);
@@ @@ -136,69 +136,69 @@ var callbacks = function(State){ @@
+            }
+      }
       highlight_lines(h_lines);
       $('#L'+h_lines[0]).each(function(){
           this.scrollIntoView();
       });
+    }
     // select code link event
     $('#hlcode').mouseup(getSelectionLink);
     // history select field
     var cache = {}
+    var cache = {};
     $("#diff1").select2({
         placeholder: _TM['Select changeset'],
         dropdownAutoWidth: true,
         query: function(query){
           var key = 'cache';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push({'id': this.id, 'text': this.text})
+                        children.push({'id': this.id, 'text': this.text});
+                    }
                 })
                 data.results.push({'text': section, 'children': children})
                 });
                 data.results.push({'text': section, 'children': children});
             });
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('files_history_home', {'revision': _rev, 'f_path': _f_path}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback({results: data.results});
+                }
               })
+              });
+          }
+        }
     });
     $('#show_authors').on('click', function(){
         $.ajax({
             url: pyroutes.url('files_authors_home', {'revision': _rev, 'f_path': _f_path}),
             success: function(data) {
                 $('#file_authors').html(data);
                 $('#file_authors').show();
                 tooltip_activate()
+                tooltip_activate();
+            }
         })
     })
         });
     });
+}
 $(document).ready(function(){
     ypjax_links();
     var $files_data = $('#files_data');
     //Bind to StateChange Event
     History.Adapter.bind(window,'statechange',function(){
         var State = History.getState();
         cache_key = State.url;
         //check if we have this request in cache maybe ?
         var _cache_obj = CACHE[cache_key];
         var _cur_time = new Date().getTime();

kallithea/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -113,14 +113,14 @@ @@
             </tbody>
         </table>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         // init node filter if we pass GET param ?search=1
         var search_GET = "${request.GET.get('search','')}";
         if(search_GET == "1"){
             $("#filter_activate").click();
+        }
     })
+    });
 </script>

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -89,24 +89,24 @@ $(document).ready(function(){ @@
                 // default plain text
                 $(opt).attr('selected', 'selected');
                 modes_select.options[0] = opt;
             } else {
                 modes_select.options[index++] = opt;
+            }
+        }
     });
     // try to detect the mode based on the file we edit
     var detected_mode = CodeMirror.findModeByExtension("${c.file.extension}");
     if(detected_mode){
         setCodeMirrorMode(myCodeMirror, detected_mode);
         $($('#set_mode option[value="'+detected_mode.mime+'"]')[0]).attr("selected", "selected")
+        $($('#set_mode option[value="'+detected_mode.mime+'"]')[0]).attr("selected", "selected");
+    }
     $('#set_mode').on('change', function(e){
         var selected = e.currentTarget;
         var node = selected.options[selected.selectedIndex];
         var detected_mode = CodeMirror.findModeByMIME(node.value);
         setCodeMirrorMode(myCodeMirror, detected_mode);
     });
 })
+});
 </script>
 </%def>

kallithea/templates/files/files_source.html

➞

Show inline comments

@@ @@ -81,14 +81,14 @@ @@
     $(document).ready(function(){
         // fake html5 history state
         var _State = {
            url: "${h.url.current()}",
            data: {
              node_list_url: node_list_url.replace('__REV__',"${c.changeset.raw_id}").replace('__FPATH__', "${h.safe_unicode(c.file.path)}"),
              url_base: url_base.replace('__REV__',"${c.changeset.raw_id}"),
              rev:"${c.changeset.raw_id}",
              f_path: "${h.safe_unicode(c.file.path)}"
+           }
+        }
         callbacks(_State) // defined in files.html, main callbacks. Triggerd in pjax calls
     })
+    });
 </script>

kallithea/templates/forks/fork.html

➞

Show inline comments

@@ @@ -99,15 +99,15 @@ ${self.repo_context_bar('createfork')} @@
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#repo_group").select2({
             'dropdownAutoWidth': true
         });
         $("#landing_rev").select2({
             'minimumResultsForSearch': -1
         });
         $('#repo_name').focus();
     })
+    });
 </script>
 </%def>

kallithea/templates/index_base.html

➞

Show inline comments

@@ @@ -103,25 +103,25 @@ @@
                {key:"atom"}
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req, ${len(group_name)})
+                    var pos = data[i].raw_name.toLowerCase().indexOf(req, ${len(group_name)});
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             YUD.get('repo_count').innerHTML = res.results.length;
             return res;
+        }
         // main table sorting
         var myColumnDefs = [

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -163,25 +163,25 @@ @@
                {key:"action"}
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req)
+                    var pos = data[i].raw_name.toLowerCase().indexOf(req);
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             return res;
+        }
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
@@ @@ -254,25 +254,25 @@ @@
                {key:"action"}
+            ]
          };
         myDataSource.doBeforeCallback = function(req,raw,res,cb) {
             // This is the filter function
             var data     = res.results || [],
                 filtered = [],
                 i,l;
             if (req) {
                 req = req.toLowerCase();
                 for (i = 0; i<data.length; i++) {
                     var pos = data[i].raw_name.toLowerCase().indexOf(req)
+                    var pos = data[i].raw_name.toLowerCase().indexOf(req);
                     if (pos != -1) {
                         filtered.push(data[i]);
+                    }
+                }
                 res.results = filtered;
+            }
             return res;
+        }
         // main table sorting
         var myColumnDefs = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -55,26 +55,26 @@ ${self.repo_context_bar('options')} @@
                     </div>
                 </div>
                 <div style="font-weight: bold;clear:both;margin-left:200px">${c.runtime}</div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="type">${_('Search in')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ('commit',_('Commit messages')),
                         ('path',_('File names'))
                         ##('repository',_('Repository names'))
                         ('path',_('File names')),
                         ##('repository',_('Repository names')),
                         ])}
                 </div>
              </div>
         </div>
     </div>
     ${h.end_form()}
     <div class="search">
     %if c.cur_type == 'content':
         <%include file='search_content.html'/>
     %elif c.cur_type == 'path':
         <%include file='search_path.html'/>

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -370,25 +370,25 @@ function SummaryPlot(from,to,dataset,ove @@
                 var tooltip = YUD.get("tooltip");
                 if(tooltip) {
                       tooltip.parentNode.removeChild(tooltip);
+                }
                 var x = item.datapoint.x.toFixed(2);
                 var y = item.datapoint.y.toFixed(2);
                 if (!item.series.label){
                     item.series.label = 'commits';
+                }
                 var d = new Date(x*1000);
                 var fd = d.toDateString()
+                var fd = d.toDateString();
                 var nr_commits = parseInt(y);
                 var cur_data = dataset[item.series.label].data[item.dataIndex];
                 var added = cur_data.added;
                 var changed = cur_data.changed;
                 var removed = cur_data.removed;
                 var nr_commits_suffix = " ${_('commits')} ";
                 var added_suffix = " ${_('files added')} ";
                 var changed_suffix = " ${_('files changed')} ";
                 var removed_suffix = " ${_('files removed')} ";
@@ @@ -424,25 +424,25 @@ function SummaryPlot(from,to,dataset,ove @@
     //main plot
     var plot = YAHOO.widget.Flot(plotContainer,data,plot_options);
     //overview
     var overview = YAHOO.widget.Flot(overviewContainer,
             overview_dataset, overview_options);
     //show initial selection on overview
     overview.setSelection(initial_ranges);
     plot.subscribe("plotselected", plotselected);
     plot.subscribe("plothover", plothover)
+    plot.subscribe("plothover", plothover);
     overview.subscribe("plotselected", function (ranges) {
         plot.setSelection(ranges);
     });
     // user choices on overview
     YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
+}
     SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n});
 </script>
 </%def>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -258,70 +258,70 @@ $(document).ready(function(){ @@
         dropdownAutoWidth: true,
         query: function(query){
           var key = 'cache';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                         children.push({'id': this.id, 'text': this.text})
+                        children.push({'id': this.id, 'text': this.text});
+                    }
                 })
                 data.results.push({'text': section, 'children': children})
                 });
                 data.results.push({'text': section, 'children': children});
             });
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.repo_name}'}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback({results: data.results});
+                }
               })
+              });
+          }
+        }
     });
     // on change of download options
     $('#download_options').change(function(e){
        var new_cs = e.added
        for(k in tmpl_links){
            var s = $('#'+k+'_link');
            if(s){
              var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
              title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text);
              title_tmpl = title_tmpl.replace('__CS_EXT__',k);
              title_tmpl = '<i class="icon-file-zip"></i> '+ title_tmpl;
              var url = tmpl_links[k].replace('__CS__',new_cs.id);
              var subrepos = $('#archive_subrepos').is(':checked');
              url = url.replace('__SUB__',subrepos);
              url = url.replace('__NAME__',title_tmpl);
              s.html(url)
+             s.html(url);
+           }
+       }
     });
     var tmpl_links = {};
     %for cnt,archive in enumerate(c.db_repo_scm_instance._get_archives()):
       tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-small')}';
     %endfor
 })
+});
 </script>
 %if c.show_stats:
 <script type="text/javascript">
 $(document).ready(function(){
     var data = ${c.trending_languages|n};
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
     tbl.setAttribute('class','trending_language_tbl');
     var cnt = 0;
     for (var i=0;i<data.length;i++){

0 comments (0 inline, 0 general)