kallithea Changeset - df5b6fc6c518

@@ @@ -2014,97 +2014,97 @@ var YUI_paginator = function(links_per_p @@
                 this.rightmost_page = _pos[2];
                 if (e && e.prevValue === e.newValue) {
                     return;
+                }
                 var par   = this.current ? this.current.parentNode : null,
                     after = this.link;
                 if (par) {
                     // only show the last page if the rightmost one is
                     // lower, so we don't have doubled entries at the end
                     if (!(this.rightmost_page < p.getTotalPages())){
                         after = this.span
+                    }
                     if (this.current !== after) {
                         par.replaceChild(after,this.current);
                         this.current = after;
+                    }
+                }
                 this.current.innerHTML = this.paginator.getTotalPages();
             },
             destroy : function () {
                 YUE.purgeElement(this.link);
                 this.current.parentNode.removeChild(this.current);
                 this.link = this.span = null;
             },
             onClick : function (e) {
                 YUE.stopEvent(e);
                 this.paginator.setPage(this.paginator.getTotalPages());
+            }
         };
         })();
     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) {
         // 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)
                 if (pos != -1) {
                     filtered.push(data[i]);
+                }
+            }
             res.results = filtered;
+        }
         $(countnode).html(res.results.length);
         return res;
+    }
     var myDataTable = new YAHOO.widget.DataTable("datatable_list_wrap", columns, myDataSource, {
         sortedBy: {key:sortkey, dir:"asc"},
         paginator: YUI_paginator(rows !== undefined && rows ? rows : 25, ['user-paginator']),
         MSG_SORTASC: _TM['MSG_SORTASC'],
         MSG_SORTDESC: _TM['MSG_SORTDESC'],
         MSG_EMPTY: _TM['MSG_EMPTY'],
         MSG_ERROR: _TM['MSG_ERROR'],
         MSG_LOADING: _TM['MSG_LOADING']
         });
     myDataTable.subscribe('postRenderEvent',function(oArgs) {
         tooltip_activate();
         quick_repo_menu();
         });
     var filterTimeout = null;
     var $q_filter = $('#q_filter');

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -119,56 +119,56 @@ @@
                 // on type the new filename set mode
                 $filename.keyup(function(e){
                     var file_data = CodeMirror.getFilenameAndExt(this.value);
                     if(file_data['ext'] != null){
                         var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
                         if (detected_mode){
                             setCodeMirrorMode(myCodeMirror, detected_mode);
                             $modes_select.val(detected_mode.mime);
+                        }
+                    }
                 });
                 // set mode on page load
                 var detected_mode = CodeMirror.findModeByExtension("${file.extension}");
                 if (detected_mode){
                     setCodeMirrorMode(myCodeMirror, detected_mode);
                     $modes_select.val(detected_mode.mime);
+                }
                 </script>
             %endfor
             <div style="padding-top: 5px">
             ${h.submit('update',_('Update Gist'),class_="btn btn-mini btn-success")}
             <a class="btn btn-mini" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>
             </div>
           ${h.end_form()}
           <script>
               $('#update').on('click', function(e){
                   e.preventDefault();
                   // check for newer version.
                   $.ajax({
                     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

@@ @@ -34,50 +34,50 @@ @@
                  %endif
             </td>
             <td>
                 ${h.form(url('my_account_api_keys'),method='delete')}
                     ${h.hidden('del_api_key',api_key.api_key)}
                     <button class="btn btn-mini btn-danger" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('my_account_api_keys'), method='post')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="description">${_('New API key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${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

 <div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You Own')}</div>
 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter"
        placeholder="${_('quick filter...')}" value=""/>
 <div class="table-grid table yui-skin-sam" id="repos_list_wrap"></div>
 <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
 <script>
 function table_renderer(data){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: [
             {key:"menu"},
             {key:"raw_name"},
             {key:"name"},
             {key:"last_changeset"},
             {key:"last_rev_raw"},
             {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,
               sortOptions: { sortFunction: nameSort }},
           {key:"last_changeset",label:"${_('Tip')}",sortable:true,
               sortOptions: { sortFunction: revisionSort }},
           {key:"action",label:"${_('Action')}",sortable:false}
       ];
       var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
         sortedBy:{key:"name",dir:"asc"},
         paginator: YUI_paginator(50, ['user-paginator']),
         MSG_SORTASC:"${_('Click to sort ascending')}",
         MSG_SORTDESC:"${_('Click to sort descending')}",
         MSG_EMPTY:"${_('No records found.')}",
         MSG_ERROR:"${_('Data error.')}",
         MSG_LOADING:"${_('Loading...')}"
+      }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
       });
       var filterTimeout = null;
       updateFilter = function() {
           // Reset timeout
           filterTimeout = null;
           // Reset sort
           var state = myDataTable.getState();
           state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
           // Get filtered data
           myDataSource.sendRequest(YUD.get('q_filter').value,{
               success : myDataTable.onDataReturnInitializeTable,

kallithea/templates/admin/my_account/my_account_watched.html

➞

Show inline comments

 <div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Repositories You are Watching')}</div>
 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter"
        placeholder="${_('quick filter...')}" value=""/>
 <div class="table-grid table yui-skin-sam" id="repos_list_wrap"></div>
 <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
 <script>
 function table_renderer(data){
     var myDataSource = new YAHOO.util.DataSource(data);
     myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
     myDataSource.responseSchema = {
         resultsList: "records",
         fields: [
             {key:"menu"},
             {key:"raw_name"},
             {key:"name"},
             {key:"last_changeset"},
             {key:"last_rev_raw"},
             {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,
               sortOptions: { sortFunction: nameSort }},
           {key:"last_changeset",label:"${_('Tip')}",sortable:true,
               sortOptions: { sortFunction: revisionSort }},
           {key:"action",label:"${_('Action')}",sortable:false}
       ];
       var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
         sortedBy:{key:"name",dir:"asc"},
         paginator: YUI_paginator(50, ['user-paginator']),
         MSG_SORTASC:"${_('Click to sort ascending')}",
         MSG_SORTDESC:"${_('Click to sort descending')}",
         MSG_EMPTY:"${_('No records found.')}",
         MSG_ERROR:"${_('Data error.')}",
         MSG_LOADING:"${_('Loading...')}"
+      }
       );
       myDataTable.subscribe('postRenderEvent',function(oArgs) {
           tooltip_activate();
           quick_repo_menu();
       });
       var filterTimeout = null;
       updateFilter = function() {
           // Reset timeout
           filterTimeout = null;
           // Reset sort
           var state = myDataTable.getState();
           state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
           // Get filtered data
           myDataSource.sendRequest(YUD.get('q_filter').value,{
               success : myDataTable.onDataReturnInitializeTable,

kallithea/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -3,52 +3,52 @@ @@
 <%block name="title">
     ${_('Show Notification')} ${c.authuser.username}
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Notifications'),h.url('notifications'))}
     &raquo;
     ${_('Show Notification')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
           <div class="gravatar">
             ${h.gravatar(c.notification.created_by_user.email, size=24)}
           </div>
           <div class="desc">
               ${c.notification.description}
           </div>
           <div class="delete-notifications">
             <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-circled" id="yui-gen24"></i></span>
           </div>
         </div>
         <div class="notification-body">
         <div class="notification-subject">${h.literal(c.notification.subject)}</div>
         %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

@@ @@ -31,65 +31,65 @@ @@
              <div class="field">
                 <div class="label">
                     <label for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='small')}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea-repo editor">
                     ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
                 </div>
             </div>
             <div class="field">
                  <div class="label">
                      <label for="group_parent_id">${_('Group parent')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
                  </div>
             </div>
             <div id="copy_perms" class="field">
                 <div class="label label-checkbox">
                     <label for="group_copy_permissions">${_('Copy parent group permissions')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('group_copy_permissions',value="True")}
                     <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
                 </div>
             </div>
             <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',
  c.repo_group.repositories_recursive_count) % (c.repo_group.group_name, c.repo_group.repositories_recursive_count)}');">
         <i class="icon-minus-circled"></i>
         ${_('Delete this repository group')}
     </button>
 ${h.end_form()}

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

@@ @@ -16,50 +16,50 @@ ${h.form(url('repos_group',group_name=c. @@
             <div class="label label-textarea">
                 <label for="group_description">${_('Description')}:</label>
             </div>
             <div class="textarea text-area editor">
                 ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
             </div>
         </div>
         <div class="field">
             <div class="label">
                 <label for="group_parent_id">${_('Group parent')}:</label>
             </div>
             <div class="input">
                 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
             </div>
         </div>
         <div class="field">
             <div class="label label-checkbox">
                 <label for="enable_locking">${_('Enable locking')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('enable_locking',value="True")}
                 <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
             </div>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
         </div>
     </div>
 </div>
 ${h.end_form()}
 ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name),method='delete')}
 <div class="form">
     <div class="fields">
         <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

@@ @@ -45,84 +45,84 @@ ${h.form(url('repos'))} @@
                  <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
              </div>
         </div>
         <div id="copy_perms" class="field">
             <div class="label label-checkbox">
                 <label for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('repo_copy_permissions',value="True")}
                 <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
             </div>
         </div>
         <div class="field">
             <div class="label">
                 <label for="repo_type">${_('Type')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_type','hg',c.backends,class_="small")}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
         </div>
         <div class="field">
             <div class="label">
                 <label for="repo_landing_rev">${_('Landing revision')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
         <div class="field">
             <div class="label label-checkbox">
                 <label for="repo_private">${_('Private repository')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('repo_private',value="True")}
                 <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

@@ @@ -12,55 +12,55 @@ @@
 <%def name="breadcrumbs_links()">
     ${_('Creating repository')} ${c.repo}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div style="display:table; padding: 10px 0px; font-size: 14px;font-weight: bold;margin-right: auto;margin-left: auto">
         ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
     </div>
     <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
         <div class="progress progress-striped active">
           <div class="progress-bar progress-bar" role="progressbar"
                aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
           </div>
         </div>
     </div>
     <div id="progress_error" style="display: none;">
         <div style="font-weight: bold; color:#aa1111">
         ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}
         </div>
     </div>
 </div>
 <script>
 (function worker() {
   $.ajax({
     url: '${h.url('repo_check_home', repo_name=c.repo_name, repo=c.repo, task_id=c.task_id)}',
     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

 <h3>${_('Parent')}</h3>
 ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='put')}
 <div class="form">
        ${h.select('id_fork_of','',c.repos_list,class_="medium")}
        ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-small")}
        <div class="field" style="border:none;color:#888">
        <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:
     <button class="btn btn-small" type="submit">
         <i class="icon-plus"></i>
         ${_('Add to Public Journal')}
     </button>
   %endif
   </div>
  <div class="field" style="border:none;color:#888">
  <ul>
       <li>${_('All actions done in this repository will be visible to everyone in the public journal.')}</li>
  </ul>
  </div>
 </div>
 ${h.end_form()}
 <h3>${_('Change Locking')}</h3>
 ${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='put')}
 <div class="form">
       %if c.repo_info.locked[0]:
         ${h.hidden('set_unlock', '1')}
         <button class="btn btn-small" type="submit"
                 onclick="return confirm('${_('Confirm to unlock repository.')}');">
             <i class="icon-lock-open-alt"></i>
             ${_('Unlock Repository')}
         </button>
        ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))}
       %else:
         ${h.hidden('set_lock', '1')}
         <button class="btn btn-small" type="submit"
                 onclick="return confirm('${_('Confirm to lock repository.')}');">
             <i class="icon-lock"></i>
             ${_('Lock Repository')}
         </button>
         ${_('Repository is not locked')}
       %endif
    <div class="field" style="border:none;color:#888">
    <ul>

kallithea/templates/admin/repos/repo_edit_fork.html

➞

Show inline comments

 ${h.form(url('repo_as_fork', repo_name=c.repo_info.repo_name),method='put')}
 <div class="form">
    <div class="fields">
        ${h.select('id_fork_of','',c.repos_list,class_="medium")}
        ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-small")}
    </div>
        <div class="field" style="border:none;color:#888">
        <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

@@ @@ -98,67 +98,67 @@ ${h.form(url('repo', repo_name=c.repo_in @@
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="repo_enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="repo_enable_locking">${_('Enable locking')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
                 </div>
             </div>
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="field">
                     <div class="label">
                         <label for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     </div>
                     <div class="input input-medium">
                         ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="buttons">
               ${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

 <dl class="dl-horizontal">
 <%
  elems = [
     (_('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">
             <div class="field">
                 <div class="label">
                     <label for="test_email">${_('Send test email to')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('test_email',size=30)}
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('send',_('Send'),class_="btn")}
             </div>
         </div>
     </div>
 ${h.end_form()}

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>
 <h4>${_('Python Packages')}</h4>
 <table class="table" style="margin:0px 0px 0px 0px">
   <colgroup>
       <col style="width:180px">
   </colgroup>
   <tbody>
       %for key, value in c.modules:
           <tr>
               <td style="padding-right:5px;">${key}</td>
               <td>${value}</td>
           </tr>
       %endfor
   </tbody>
 </table>
 <script>
     $('#check_for_update').click(function(e){
         var $update_notice = $('#update_notice');
         $update_notice.show();
         asynchtml("${h.url('admin_settings_system_update')}", $update_notice);
     });
 </script>

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -46,51 +46,51 @@ ${h.form(url('admin_settings'), method=' @@
                         ${h.checkbox('extensions_largefiles','True')}
                         <label for="extensions_largefiles">${_('Enable largefiles extension')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('extensions_hgsubversion','True')}
                         <label for="extensions_hgsubversion">${_('Enable hgsubversion extension')}</label>
                     </div>
                     <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span>
                     ##<div class="checkbox">
                     ##    ${h.checkbox('extensions_hggit','True')}
                     ##    <label for="extensions_hggit">${_('Enable hg-git extension')}</label>
                     ##</div>
                     ##<span class="help-block">${_('Requires hg-git library to be installed. Enables cloning of remote Git repositories while converting them to Mercurial.')}</span>
                 </div>
             </div>
             %if c.visual.allow_repo_location_change:
             <div class="field">
                 <div class="label">
                     <label for="paths_root_path">${_('Location of repositories')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")}
                     <span id="path_unlock" class="tooltip" style="cursor: pointer"
                             title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}">
                         <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div>
                     </span>
                     <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span>
                 </div>
             </div>
             %else:
             ## form still requires this but we cannot internally change it anyway
             ${h.hidden('paths_root_path',size=30,readonly="readonly", class_="disabled")}
             %endif
             <div class="buttons">
                 ${h.submit('save',_('Save Settings'),class_="btn")}
                 ${h.reset('reset',_('Reset'),class_="btn")}
            </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

@@ @@ -19,51 +19,51 @@ @@
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="users_group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('users_group_name',class_='small')}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="user_group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('user_group_description')}
                     <span class="help-block">${_('Short, optional description for this user group.')}</span>
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="users_group_active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>
              </div>
             <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>
         ${_('Delete this user group')}
     </button>
 ${h.end_form()}

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -58,51 +58,51 @@ @@
                 <div class="label">
                     <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='small')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='small')}
                     ${h.hidden('extern_name', c.default_extern_type)}
                     ${h.hidden('extern_type', c.default_extern_type)}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>
              </div>
             <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>
         ${_('Delete this user')}
     </button>
 ${h.end_form()}

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -34,50 +34,50 @@ @@
                  %endif
             </td>
             <td>
                 ${h.form(url('edit_user_api_keys', id=c.user.user_id),method='delete')}
                     ${h.hidden('del_api_key',api_key.api_key)}
                     <button class="btn btn-mini btn-danger" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('edit_user_api_keys', id=c.user.user_id), method='post')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="description">${_('New API key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${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

@@ @@ -374,223 +374,223 @@ @@
+                }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<span class="repotag">git</span> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-keyhole-circled"></i> ';
+                }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-globe"></i> ';
+                }
                 tmpl += '</span>';
+            }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder"></i> ';
+            }
             tmpl += state.text;
             return tmpl;
+        }
         $("#repo_switcher").select2({
             placeholder: '<i class="icon-database"></i> ${_('Repositories')}',
             dropdownAutoWidth: true,
             formatResult: format,
             formatSelection: format,
             formatNoMatches: function(term){
                 return "${_('No matches found')}";
             },
             containerCssClass: "repo-switcher",
             dropdownCssClass: "repo-switcher-dropdown",
             escapeMarkup: function(m){
                 // don't escape our custom placeholder
                 if(m.substr(0,29) == '<i class="icon-database"></i>'){
                     return m;
+                }
                 return Select2.util.escapeMarkup(m);
             },
             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
         Mousetrap.bind(['command+b', 'ctrl+b'], function(e) {
             if($('#header-inner').hasClass('hover') && $('#content').hasClass('hover')){
                 $('#header-inner').removeClass('hover');
                 $('#content').removeClass('hover');
+            }
             else{
                 $('#header-inner').addClass('hover');
                 $('#content').addClass('hover');
+            }
             return false;
         });
         // general nav g + action
         Mousetrap.bind(['g h'], function(e) {
             window.location = pyroutes.url('home');
         });
         Mousetrap.bind(['g g'], function(e) {
             window.location = pyroutes.url('gists', {'private':1});
         });
         Mousetrap.bind(['g G'], function(e) {
             window.location = pyroutes.url('gists', {'public':1});
         });
         Mousetrap.bind(['n g'], function(e) {
             window.location = pyroutes.url('new_gist');
         });
         Mousetrap.bind(['n r'], function(e) {
             window.location = pyroutes.url('new_repo');
         });
         % if hasattr(c, 'repo_name') and hasattr(c, 'db_repo'):
             // nav in repo context
             Mousetrap.bind(['g s'], function(e) {
                 window.location = pyroutes.url('summary_home', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g c'], function(e) {
                 window.location = pyroutes.url('changelog_home', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g F'], function(e) {
                 window.location = pyroutes.url('files_home', {'repo_name': REPO_NAME, 'revision': '${c.db_repo.landing_rev[1]}', 'f_path': '', 'search': '1'});
             });
             Mousetrap.bind(['g f'], function(e) {
                 window.location = pyroutes.url('files_home', {'repo_name': REPO_NAME, 'revision': '${c.db_repo.landing_rev[1]}', 'f_path': ''});
             });
             Mousetrap.bind(['g o'], function(e) {
                 window.location = pyroutes.url('edit_repo', {'repo_name': REPO_NAME});
             });
             Mousetrap.bind(['g O'], function(e) {
                 window.location = pyroutes.url('edit_repo_perms', {'repo_name': REPO_NAME});
             });
         % endif
     </script>
 </%def>
 %if 0:
 <div class="modal" id="help_kb" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon-cancel-circled"></i></button>
           <h4 class="modal-title">${_('Keyboard shortcuts')}</h4>
         </div>
         <div class="modal-body">
            <div class="row">
               <div class="col-md-5">
                 <table class="keyboard-mappings">
                     <tbody>
                   <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>
               </div>
               <div class="col-md-offset-5">
                 <table class="keyboard-mappings">
                 <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>
               </div>
             </div>
         </div>
         <div class="modal-footer">
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 %endif

kallithea/templates/base/default_perms_box.html

➞

Show inline comments

@@ @@ -38,52 +38,52 @@ ${h.form(form_url, method='put')} @@
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_user_group_perm">${_('Create user groups')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_user_group_perm',value=True)}
                     <span class="help-block">
                         ${h.literal(_('Select this option to allow user group creation for this user'))}
                     </span>
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="fork_repo_perm">${_('Fork repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('fork_repo_perm',value=True)}
                     <span class="help-block">
                         ${h.literal(_('Select this option to allow repository forking for this user'))}
                     </span>
                 </div>
              </div>
             </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
 ${h.end_form()}
 ## JS
 <script>
 $(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

@@ @@ -78,51 +78,51 @@ @@
                           %if section == 'repositories':
                               <a href="${h.url('edit_repo_perms',repo_name=k,anchor='permissions_manage')}">${_('Edit')}</a>
                           %elif section == 'repositories_groups':
                               <a href="${h.url('edit_repo_group_perms',group_name=k,anchor='permissions_manage')}">${_('Edit')}</a>
                           %elif section == 'user_groups':
                               ##<a href="${h.url('edit_users_group',id=k)}">${_('Edit')}</a>
                           %endif
                       </td>
                       %endif
                   </tr>
                   %endif
               %endfor
               <tr id="empty_${section}" style="display: none"><td colspan="6">${_('No permission defined')}</td></tr>
               </tbody>
           %endif
          </table>
         </div>
         %endif
      %endfor
 </div>
 <script>
     $(document).ready(function(){
         var show_empty = function(section){
             var visible = $('.section_{0} tr.perm_row:visible'.format(section)).length;
             if(visible == 0){
                 $('#empty_{0}'.format(section)).show();
+            }
             else{
                 $('#empty_{0}'.format(section)).hide();
+            }
+        }
         var update_show = function($checkbox){
             var section = $checkbox.attr('section');
             var elems = $('.filter_' + section).each(function(el){
                 var perm_type = $checkbox.attr('perm_type');
                 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

@@ @@ -165,97 +165,97 @@ ${self.repo_context_bar('changelog', c.f @@
         <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script>
         <script type="text/javascript">
             $(document).ready(function(){
                 //Monitor range checkboxes and build a link to changesets ranges
                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                 // register extra routes needed for this view
                 pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
                 var checkbox_checker = function(e){
                     var checked_checkboxes = [];
                     for (pos in checkboxes){
                         if(checkboxes[pos].checked){
                             checked_checkboxes.push(checkboxes[pos]);
+                        }
+                    }
                     if(YUD.get('open_new_pr')){
                         if(checked_checkboxes.length>1){
                             YUD.setStyle('open_new_pr','display','none');
                         } else {
                             YUD.setStyle('open_new_pr','display','');
                             if(checked_checkboxes.length>0){
                                 YUD.get('open_new_pr').innerHTML = _TM['Open New Pull Request for Selected Changesets'];
                             }else{
                                 YUD.get('open_new_pr').innerHTML = _TM['Open New Pull Request'];
+                            }
+                        }
+                    }
                     if(checked_checkboxes.length>0){
                         var rev_end = checked_checkboxes[0].name;
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}',
                                                                   'revision': rev_start+'...'+rev_end});
                         var link = (rev_start == rev_end)
                             ? _TM['Show Selected Changeset __S']
                             : _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}',
                                                                         'branch':'${c.first_revision.branch}'});
                         %endif
                         YUD.setStyle('compare_fork','display','');
+                    }
                 };
                 checkbox_checker();
                 YUE.on(checkboxes,'click', checkbox_checker);
                 YUE.on('rev_range_clear','click',function(e){
                     for (var i=0; i<checkboxes.length; i++){
                         var cb = checkboxes[i];
                         cb.checked = false;
+                    }
                     checkbox_checker();
                     YUE.preventDefault(e);
                 });
                 var $msgs = $('.message');
                 // get first element height
                 var el = $('#graph_content .container')[0];
                 var row_h = el.clientHeight;
                 $msgs.each(function() {
                     var m = this;
                     var h = m.clientHeight;
                     if(h > row_h){
                         var offset = row_h - (h+12);
                         $(m.nextElementSibling).css('display', 'block');
                         $(m.nextElementSibling).css('margin-top', offset+'px');
+                    }
                 });
                 $('.expand_commit').on('click',function(e){
                     var cid = $(this).attr('commit_id');
                     $('#C-'+cid).toggleClass('expanded');

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -201,97 +201,97 @@ ${self.repo_context_bar('changelog', c.c @@
               injectInlineForm(tr.parentNode.parentNode);
           });
           // inject comments into they proper positions
           var file_comments = $('.inline-comment-placeholder').toArray();
           renderInlineComments(file_comments);
           linkInlineComments(document.getElementsByClassName('firstlink'), document.getElementsByClassName("comment"));
           pyroutes.register('changeset_home',
                             "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}",
                             ['repo_name', 'revision']);
           //next links
           $('#child_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(!$('#child_link').hasClass('disabled')){
                   $.ajax({
                     url: '${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}',
                     success: function(data) {
                       if(data.results.length === 0){
                           $('#child_link').addClass('disabled');
                           $('#child_link').html('${_('No revisions')}');
+                      }
                       if(data.results.length === 1){
                           var commit = data.results[0];
                           window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});
+                      }
                       else if(data.results.length === 2){
                           $('#child_link').addClass('disabled');
                           $('#child_link').addClass('double');
                           var _html = '';
                           _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[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .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')}');
+                      }
                       if(data.results.length === 1){
                           var commit = data.results[0];
                           window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});
+                      }
                       else if(data.results.length === 2){
                           $('#parent_link').addClass('disabled');
                           $('#parent_link').addClass('double');
                           var _html = '';
                           _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));
                           _html +='<br/>'
                           _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .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}));
                           $('#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

@@ @@ -68,142 +68,142 @@ ${self.repo_context_bar('changelog')} @@
                      <div class="cs_${change}">
                          <div class="node">
                              <i class="icon-diff-${change}"></i>
                              ${h.link_to(h.safe_unicode(f), '#' + fid)}
                          </div>
                          <div class="changes">${h.fancy_file_stats(stat)}</div>
                      </div>
                   %endfor
                 </div>
                 % if c.limited_diff:
                   <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>
                 % endif
          </div>
         ## diff block
         <%namespace name="diff_block" file="/changeset/diff_block.html"/>
         ${diff_block.diff_block_js()}
         %for fid, change, f, stat in c.files:
           ${diff_block.diff_block_simple([c.changes[fid]])}
         %endfor
         % if c.limited_diff:
           <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>
         % endif
     %endif
     </div>
 </div>
     <script type="text/javascript">
    $(document).ready(function(){
     var cache = {}
     $("#compare_org").select2({
         placeholder: "${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)}",
         formatSelection: function(obj){
             return '{0}@{1}'.format("${c.a_repo.repo_name}", obj.text)
         },
         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
+        }
+    }
     values_changed();
     $('#compare_org').change(values_changed);
     $('#compare_other').change(values_changed);
     $('#compare_revs').on('click', function(e){
         var org = $('#compare_org').select2('data');
         var other = $('#compare_other').select2('data');
         if (!org || !other) {
             return;
+        }
         var compare_url = "${h.url('compare_url',repo_name=c.repo_name,org_ref_type='__other_ref_type__',org_ref_name='__org__',other_ref_type='__org_ref_type__',other_ref_name='__other__', other_repo=c.cs_repo.repo_name)}";
         var u = compare_url.replace('__other_ref_type__',org.type)
                            .replace('__org__',org.text)
                            .replace('__org_ref_type__',other.type)
                            .replace('__other__',other.text);
         window.location = u;
     });
    });
     </script>
 </%def>

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -30,80 +30,80 @@ ${self.repo_context_bar('changelog')} @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="diff-container" style="overflow-x: hidden">
         <div class="diffblock comm" style="margin:3px; padding:1px">
             <div class="code-header">
                 <div class="changeset_header">
                     <div class="changeset_file">
                         ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,
                         revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}
                     </div>
                     <div class="diff-actions">
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}">
                           <i class="icon-file-code"></i>
                       </a>
                       <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}">
                           <i class="icon-docs"></i>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}">
                           <i class="icon-diff"></i>
                       </a>
                       <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">
                           <i class="icon-floppy"></i>
                       </a>
                       ${h.checkbox('ignorews', label=_('Ignore whitespace'))}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 <script>
 var orig1_url = '${h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id)}';
 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

@@ @@ -19,222 +19,222 @@ @@
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('files', c.revision)}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li style="color:white">
               ${_("Branch filter:")} ${h.select('branch_selector',c.changeset.raw_id,c.revision_options)}
             </li>
         </ul>
     </div>
     <div class="table">
         <div id="files_data">
             <%include file='files_ypjax.html'/>
         </div>
     </div>
 </div>
 <script type="text/javascript">
 var CACHE = {};
 var CACHE_EXPIRE = 5*60*1000; //cache for 5*60s
 //used to construct links from the search list
 var url_base = '${h.url("files_home",repo_name=c.repo_name,revision='__REV__',f_path='__FPATH__')}';
 //send the nodelist request to this url
 var node_list_url = '${h.url("files_nodelist_home",repo_name=c.repo_name,revision='__REV__',f_path='__FPATH__')}';
 // send the node history requst to this url
 var node_history_url = '${h.url("files_history_home",repo_name=c.repo_name,revision='__REV__',f_path='__FPATH__')}';
 ## new pyroutes URLs
 pyroutes.register('files_nodelist_home', "${h.url('files_nodelist_home', repo_name=c.repo_name,revision='%(revision)s',f_path='%(f_path)s')}", ['revision', 'f_path']);
 pyroutes.register('files_history_home', "${h.url('files_history_home', repo_name=c.repo_name,revision='%(revision)s',f_path='%(f_path)s')}", ['revision', 'f_path']);
 pyroutes.register('files_authors_home', "${h.url('files_authors_home', repo_name=c.repo_name,revision='%(revision)s',f_path='%(f_path)s')}", ['revision', 'f_path']);
 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);
         var _url_base = url_base.replace('__REV__',rev);
         // Change our States and save some data for handling events
         var data = {url:url,title:title, url_base:_url_base,
                     node_list_url:_node_list_url, rev:rev, f_path:f_path};
         History.pushState(data, title, url);
         //now we're sure that we can do ypjax things
         e.preventDefault();
         return false;
     });
+}
 // callbacks needed to process the ypjax filebrowser
 var callbacks = function(State){
     ypjax_links();
     tooltip_activate();
     if(State !== undefined){
         //inistially loaded stuff
         var _f_path = State.data.f_path;
         var _rev = State.data.rev;
         fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base);
         // Inform Google Analytics of the change
         if ( typeof window.pageTracker !== 'undefined' ) {
             window.pageTracker._trackPageview(State.url);
+        }
+    }
     function highlight_lines(lines){
         for(pos in lines){
           $('#L'+lines[pos]).css('background-color','#FFFFBE');
+        }
+    }
     page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
     if (page_highlights.length == 2){
        highlight_ranges  = page_highlights[1].split(",");
        var h_lines = [];
        for (pos in highlight_ranges){
             var _range = highlight_ranges[pos].split('-');
             if(_range.length == 2){
                 var start = parseInt(_range[0]);
                 var end = parseInt(_range[1]);
                 if (start < end){
                     for(var i=start;i<=end;i++){
                         h_lines.push(i);
+                    }
+                }
+            }
             else{
                 h_lines.push(parseInt(highlight_ranges[pos]));
+            }
+      }
       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();
         // get from cache if it's there and not yet expired !
         if(_cache_obj !== undefined && _cache_obj[0] > _cur_time){
             $files_data.html(_cache_obj[1]);
             $files_data.css('opacity','1.0');
             //callbacks after ypjax call
             callbacks(State);
+        }
         else{
             asynchtml(State.url, $files_data, function(){
                     callbacks(State);
                     var expire_on = new Date().getTime() + CACHE_EXPIRE;
                     CACHE[cache_key] = [expire_on, $files_data.html()];
                 });
+        }
     });
     // init the search filter
     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)}"
+       }
+    }
     fileBrowserListeners(_State.url, _State.data.node_list_url, _State.data.url_base);
     // change branch filter
     $("#branch_selector").select2({
         dropdownAutoWidth: true,
         minimumInputLength: 1
         });
     $("#branch_selector").change(function(e){
         var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value;

kallithea/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -77,50 +77,50 @@ @@
                     <td></td>
                 </tr>
                 %endif
             %for cnt,node in enumerate(c.file):
                 <tr class="parity${cnt%2}">
                      <td>
                          ${h.link_to(file_name(node),file_url(node,c),class_=file_class(node)+" ypjax-link")}
                      </td>
                      <td>
                      %if node.is_file():
                          ${h.format_byte_size(node.size,binary=True)}
                      %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <a title="${h.tooltip(node.last_changeset.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset)}" class="tooltip revision-link">${h.show_id(node.last_changeset)}</a>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span class="tooltip" title="${h.tooltip(h.fmt_date(node.last_changeset.date))}">
                             ${h.age(node.last_changeset.date)}</span>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span title="${node.last_changeset.author}">
                             ${h.person(node.last_changeset.author)}
                             </span>
                          %endif
                      </td>
                 </tr>
             %endfor
             </tbody>
             <tbody id="tbody_filtered" style="display:none">
             </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

@@ @@ -53,60 +53,60 @@ ${self.repo_context_bar('files')} @@
                         ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                        % endif
                       % endif
                     </div>
                 </div>
                 <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label>
                 <select id="set_mode" name="set_mode"/>
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-small")}
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 <script type="text/javascript">
 $(document).ready(function(){
     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}";
     var myCodeMirror = initCodeMirror('editor',reset_url);
    //inject new modes, based on codeMirrors modeInfo object
     $('#set_mode').each(function(){
         var modes_select = this;
         var index = 1;
         for(var i=0;i<CodeMirror.modeInfo.length;i++){
             var m = CodeMirror.modeInfo[i];
             var opt = new Option(m.name, m.mime);
             $(opt).attr('mode', m.mode);
             if (m.mime == 'text/plain') {
                 // 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

@@ @@ -45,50 +45,50 @@ @@
                 ${h.link_to(_('Delete'), '#', class_="btn btn-mini btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}
                % endif
               % endif
             </div>
         </div>
         <div class="author">
             <div class="gravatar">
                 ${h.gravatar(h.email_or_none(c.file_changeset.author), size=16)}
             </div>
             <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div>
         </div>
         <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div>
     </div>
     <div class="code-body">
       %if c.file.is_browser_compatible_image():
         <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path)}" class="img-preview"/>
       %elif c.file.is_binary:
         <div style="padding:5px">
           ${_('Binary file (%s)') % c.file.mimetype}
         </div>
       %else:
         %if c.file.size < c.cut_off_limit:
             %if c.annotate:
               ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %else:
               ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %endif
         %else:
             ${_('File is too big to display')} ${h.link_to(_('Show as raw'),
             h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))}
         %endif
       %endif
     </div>
 </div>
 <script>
     $(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

@@ @@ -63,51 +63,51 @@ ${self.repo_context_bar('createfork')} @@
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Copy permissions')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('copy_permissions',value="True", checked="checked")}
                     <span class="help-block">${_('Copy permissions from forked repository')}</span>
                 </div>
             </div>
             %if c.can_update:
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Update after clone')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('update_after_clone',value="True")}
                     <span class="help-block">${_('Checkout source after making a clone')}</span>
                 </div>
             </div>
             %endif
             <div class="buttons">
                 ${h.submit('',_('Fork this Repository'),class_="btn")}
             </div>
         </div>
     </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

@@ @@ -67,97 +67,97 @@ @@
                         ## this is commented out since for multi nested repos can be HEAVY!
                         ## in number of executed queries during traversing uncomment at will
                         ##<td><b>${gr.repositories_recursive_count}</b></td>
                     </tr>
                   % endfor
               </table>
             </div>
             <div id="group-user-paginator" style="padding: 0px 0px 0px 0px"></div>
             <div style="height: 20px"></div>
             % endif
             <div id="welcome" style="display:none;text-align:center">
                 <h1><a href="${h.url('home')}">${c.site_name} ${c.kallithea_version}</a></h1>
             </div>
             <%cnt=0%>
             <%namespace name="dt" file="/data_table/_dt_elements.html"/>
             <div class="yui-skin-sam" id="repos_list_wrap"></div>
             <div id="user-paginator" style="padding: 0px 0px 0px 0px"></div>
         </div>
     </div>
       <script>
         var data = ${c.data|n};
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"desc"},
                {key:"last_change"},
                {key:"last_changeset"},
                {key:"last_rev_raw"},
                {key:"owner"},
                {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 = [
             {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
             {key:"name",label:"${_('Name')}",sortable:true,
                 sortOptions: { sortFunction: nameSort }},
             {key:"desc",label:"${_('Description')}",sortable:true},
             {key:"last_change",label:"${_('Last Change')}",sortable:true,
                 sortOptions: { sortFunction: ageSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"owner",label:"${_('Owner')}",sortable:true},
             {key:"atom",label:"",sortable:false}
         ];
         var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: YUI_paginator(${c.visual.dashboard_items},['user-paginator']),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No repositories found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}"
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -127,188 +127,188 @@ @@
         if(!$('#show_watched').hasClass('loaded')){
             watched_renderer(${c.watched_data |n});
             $('#show_watched').addClass('loaded');
+        }
     };
     $('#show_watched').click(function(){
         show_watched();
     });
     //init watched
     show_watched();
     var tabs = {
         'watched': show_watched,
         'my': show_my
+    }
     var url = location.href.split('#');
     if (url[1]) {
         //We have a hash
         var tabHash = url[1];
         var func = tabs[tabHash]
         if (func){
             func();
+        }
+    }
     function watched_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"last_changeset"},
                {key:"last_rev_raw"},
                {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,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false}
         ];
         var myDataTable = new YAHOO.widget.DataTable("watched_repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: YUI_paginator(25, ['watched-user-paginator']),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No records found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}"
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter  = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();
             state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
             // Get filtered data
             myDataSource.sendRequest(YUD.get('q_filter_watched').value,{
                 success : myDataTable.onDataReturnInitializeTable,
                 failure : myDataTable.onDataReturnInitializeTable,
                 scope   : myDataTable,
                 argument: state
             });
         };
         $('#q_filter_watched').click(function(){
             if(!$('#q_filter_watched').hasClass('loaded')) {
                 //TODO: load here full list later to do search within groups
                 $('#q_filter_watched').css('loaded');
+            }
         });
         $('#q_filter_watched').keyup(function(){
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter,600);
         });
+      }
     function table_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);
         myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
         myDataSource.responseSchema = {
             resultsList: "records",
             fields: [
                {key:"menu"},
                {key:"raw_name"},
                {key:"name"},
                {key:"last_changeset"},
                {key:"last_rev_raw"},
                {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,
                 sortOptions: { sortFunction: nameSort }},
             {key:"last_changeset",label:"${_('Tip')}",sortable:true,
                 sortOptions: { sortFunction: revisionSort }},
             {key:"action",label:"${_('Action')}",sortable:false}
         ];
         var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
           sortedBy:{key:"name",dir:"asc"},
           paginator: YUI_paginator(25, ['user-paginator']),
           MSG_SORTASC:"${_('Click to sort ascending')}",
           MSG_SORTDESC:"${_('Click to sort descending')}",
           MSG_EMPTY:"${_('No records found.')}",
           MSG_ERROR:"${_('Data error.')}",
           MSG_LOADING:"${_('Loading...')}"
+        }
         );
         myDataTable.subscribe('postRenderEvent',function(oArgs) {
             tooltip_activate();
             quick_repo_menu();
         });
         var filterTimeout = null;
         updateFilter = function () {
             // Reset timeout
             filterTimeout = null;
             // Reset sort
             var state = myDataTable.getState();
             state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
             // Get filtered data
             myDataSource.sendRequest(YUD.get('q_filter').value,{
                 success : myDataTable.onDataReturnInitializeTable,
                 failure : myDataTable.onDataReturnInitializeTable,

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -19,71 +19,71 @@ @@
     &raquo;
     ${c.cur_query}
   %endif
 </%def>
 <%block name="header_menu">
     %if c.repo_name:
     ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
 </%block>
 <%def name="main()">
 %if c.repo_name:
 ${self.repo_context_bar('options')}
 %endif
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_name:
         ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}
     %else:
         ${h.form(h.url('search'),method='get')}
     %endif
     <div class="form">
         <div class="fields">
             <div class="field field-first field-noborder">
              <div class="label">
                  <label for="q">${_('Search term')}:</label>
              </div>
                 <div class="input">${h.text('q',c.cur_query,class_="small")}
                     <div class="button highlight">
                         <input type="submit" value="${_('Search')}" class="btn"/>
                     </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'/>
     %elif c.cur_type == 'commit':
         <%include file='search_commit.html'/>
     %elif c.cur_type == 'repository':
         <%include file='search_repository.html'/>
     %endif
     </div>
 </div>
 </%def>

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -334,115 +334,115 @@ function SummaryPlot(from,to,dataset,ove @@
         generateCheckboxes(data);
         var new_options = YAHOO.lang.merge(plot_options, {
             xaxis: {
                 min: ranges.xaxis.from,
                 max: ranges.xaxis.to,
                 mode:"time",
                 timeformat: "%d/%m"
+            }
         });
         // do the zooming
         plot = YAHOO.widget.Flot(plotContainer, data, new_options);
         plot.subscribe("plotselected", plotselected);
         //resubscribe plothover
         plot.subscribe("plothover", plothover);
         // don't fire event on the overview to prevent eternal loop
         overview.setSelection(ranges, true);
         //resubscribe choiced
         YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, ranges]);
+    }
     var previousPoint = null;
     function plothover(o) {
         var pos = o.pos;
         var item = o.item;
         //YUD.get("x").innerHTML = pos.x.toFixed(2);
         //YUD.get("y").innerHTML = pos.y.toFixed(2);
         if (item) {
             if (previousPoint != item.datapoint) {
                 previousPoint = item.datapoint;
                 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')} ";
                 if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";}
                 if(added==1){added_suffix=" ${_('file added')} ";}
                 if(changed==1){changed_suffix=" ${_('file changed')} ";}
                 if(removed==1){removed_suffix=" ${_('file removed')} ";}
                 showTooltip(item.pageX, item.pageY, item.series.label + " on " + fd
                          +'<br/>'+
                          nr_commits + nr_commits_suffix+'<br/>'+
                          added + added_suffix +'<br/>'+
                          changed + changed_suffix + '<br/>'+
                          removed + removed_suffix + '<br/>');
+            }
+        }
         else {
               var tooltip = YUD.get("tooltip");
               if(tooltip) {
                     tooltip.parentNode.removeChild(tooltip);
+              }
             previousPoint = null;
+        }
+    }
     /**
      * MAIN EXECUTION
      */
     var data = getDataAccordingToRanges(initial_ranges);
     generateCheckboxes(data);
     //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

@@ @@ -222,142 +222,142 @@ $(document).ready(function(){ @@
     var $clone_url = $('#clone_url');
     var $clone_url_id = $('#clone_url_id');
     var $clone_by_name = $('#clone_by_name');
     var $clone_by_id = $('#clone_by_id');
     $clone_url.click(function(e){
         if($clone_url.hasClass('selected')){
             return ;
         }else{
             $clone_url.addClass('selected');
             $clone_url.select();
+        }
     });
     $clone_by_name.click(function(e){
         // show url by name and hide name button
         $clone_url.show();
         $clone_by_name.hide();
         // hide url by id and show name button
         $clone_by_id.show();
         $clone_url_id.hide();
     });
     $clone_by_id.click(function(e){
         // show url by id and hide id button
         $clone_by_id.hide();
         $clone_url_id.show();
         // hide url by name and show id button
         $clone_by_name.show();
         $clone_url.hide();
     });
     var cache = {}
     $("#download_options").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('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++){
         total+= data[i][1].count;
+    }
     for (var i=0;i<data.length;i++){
         cnt += 1;
         no_data = false;
         var hide = cnt>2;
         var tr = document.createElement('tr');
         if (hide){
             tr.setAttribute('style','display:none');
             tr.setAttribute('class','stats_hidden');
+        }
         var k = data[i][0];
         var obj = data[i][1];
         var percentage = Math.round((obj.count/total*100),2);
         var td1 = document.createElement('td');
         td1.width = 150;
         var trending_language_label = document.createElement('div');
         trending_language_label.innerHTML = obj.desc+" ("+k+")";
         td1.appendChild(trending_language_label);
         var td2 = document.createElement('td');
         td2.setAttribute('style','padding-right:14px !important');
         var trending_language = document.createElement('div');
         var nr_files = obj.count+" ${_('files')}";
         trending_language.title = k+" "+nr_files;
         if (percentage>22){
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>";
+        }
         else{
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"%</b>";
+        }

0 comments (0 inline, 0 general)