kallithea Changeset - 155f281be5f8

Changeset - 155f281be5f8

Parent rev.

Child rev.

[Not reviewed]

default

0 13 0

Mads Kiilerich - 11 years ago 2014-09-08 13:38:56
madski@unity3d.com

javascript: use jQuery for ypjax and rename to asynchtml

The container id is replaced with a $target jQuery array.

13 files changed with 33 insertions and 52 deletions:

kallithea/public/js/base.js

kallithea/templates/admin/admin_log.html

kallithea/templates/admin/notifications/notifications.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/base/base.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/files/files.html

kallithea/templates/followers/followers_data.html

kallithea/templates/forks/forks_data.html

kallithea/templates/journal/journal.html

kallithea/templates/journal/journal_data.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show_my.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -164,429 +164,411 @@ var pyroutes = (function() { @@
                     output.push(parse_tree[i]);
+                }
                 else if (node_type === 'array') {
                     match = parse_tree[i]; // convenience purposes only
                     if (match[2]) { // keyword argument
                         arg = argv[cursor];
                         for (k = 0; k < match[2].length; k++) {
                             if (!arg.hasOwnProperty(match[2][k])) {
                                 throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
+                            }
                             arg = arg[match[2][k]];
+                        }
+                    }
                     else if (match[1]) { // positional argument (explicit)
                         arg = argv[match[1]];
+                    }
                     else { // positional argument (implicit)
                         arg = argv[cursor++];
+                    }
                     if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
                         throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
+                    }
                     switch (match[8]) {
                         case 'b': arg = arg.toString(2); break;
                         case 'c': arg = String.fromCharCode(arg); break;
                         case 'd': arg = parseInt(arg, 10); break;
                         case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
                         case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
                         case 'o': arg = arg.toString(8); break;
                         case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
                         case 'u': arg = Math.abs(arg); break;
                         case 'x': arg = arg.toString(16); break;
                         case 'X': arg = arg.toString(16).toUpperCase(); break;
+                    }
                     arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
                     pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
                     pad_length = match[6] - String(arg).length;
                     pad = match[6] ? str_repeat(pad_character, pad_length) : '';
                     output.push(match[5] ? arg + pad : pad + arg);
+                }
+            }
             return output.join('');
         };
         str_format.cache = {};
         str_format.parse = function(fmt) {
             var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
             while (_fmt) {
                 if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
                     parse_tree.push(match[0]);
+                }
                 else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
                     parse_tree.push('%');
+                }
                 else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
                     if (match[2]) {
                         arg_names |= 1;
                         var field_list = [], replacement_field = match[2], field_match = [];
                         if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
                             field_list.push(field_match[1]);
                             while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
                                 if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
                                     field_list.push(field_match[1]);
+                                }
                                 else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
                                     field_list.push(field_match[1]);
+                                }
                                 else {
                                     throw('[sprintf] huh?');
+                                }
+                            }
+                        }
                         else {
                             throw('[sprintf] huh?');
+                        }
                         match[2] = field_list;
+                    }
                     else {
                         arg_names |= 2;
+                    }
                     if (arg_names === 3) {
                         throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
+                    }
                     parse_tree.push(match);
+                }
                 else {
                     throw('[sprintf] huh?');
+                }
                 _fmt = _fmt.substring(match[0].length);
+            }
             return parse_tree;
         };
         return str_format;
     })();
     var vsprintf = function(fmt, argv) {
         argv.unshift(fmt);
         return sprintf.apply(null, argv);
     };
     return {
         'url': function(route_name, params) {
             var result = route_name;
             if (typeof(params) != 'object'){
                 params = {};
+            }
             if (matchlist.hasOwnProperty(route_name)) {
                 var route = matchlist[route_name];
                 // param substitution
                 for(var i=0; i < route[1].length; i++) {
                    if (!params.hasOwnProperty(route[1][i]))
                         throw new Error(route[1][i] + ' missing in "' + route_name + '" route generation');
+                }
                 result = sprintf(route[0], params);
                 var ret = [];
                 //extra params => GET
                 for(param in params){
                     if (route[1].indexOf(param) == -1){
                         ret.push(encodeURIComponent(param) + "=" + encodeURIComponent(params[param]));
+                    }
+                }
                 var _parts = ret.join("&");
                 if(_parts){
                     result = result +'?'+ _parts
+                }
+            }
             return result;
         },
         'register': function(route_name, route_tmpl, req_params) {
             if (typeof(req_params) != 'object') {
                 req_params = [];
+            }
             //fix escape
             route_tmpl = unescape(route_tmpl);
             keys = [];
             for (var i=0; i < req_params.length; i++) {
                 keys.push(req_params[i])
+            }
             matchlist[route_name] = [
                 route_tmpl,
                 keys
+            ]
         },
         '_routes': function(){
             return matchlist;
+        }
+    }
 })();
 /**
  * GLOBAL YUI Shortcuts
  */
 var YUC = YAHOO.util.Connect;
 var YUD = YAHOO.util.Dom;
 var YUE = YAHOO.util.Event;
 var YUQ = YAHOO.util.Selector.query;
 /* Invoke all functions in callbacks */
 var _run_callbacks = function(callbacks){
     if (callbacks !== undefined){
         var _l = callbacks.length;
         for (var i=0;i<_l;i++){
             var func = callbacks[i];
             if(typeof(func)=='function'){
                 try{
                     func();
                 }catch (err){};
+            }
+        }
+    }
+}
 /**
  * turns objects into GET query string
  */
 var _toQueryString = function(o) {
     if(typeof o !== 'object') {
         return false;
+    }
     var _p, _qs = [];
     for(_p in o) {
         _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p]));
+    }
     return _qs.join('&');
 };
 /**
- * Partial Ajax Implementation
+ * Load HTML into DOM using Ajax
+ *
  * @param url: defines url to make partial request
  * @param container: defines id of container to input partial result
  * @param s_call: success callback function that takes o as arg
  *  o.tId
  *  o.status
  *  o.statusText
  *  o.getResponseHeader[ ]
  *  o.getAllResponseHeaders
  *  o.responseText
  *  o.responseXML
  *  o.argument
  * @param args arguments
  * @param $target: load html async and place it (or an error message) here
  * @param success: success callback function
  * @param args: query parameters to pass to url
  */
 function ypjax(url, container, s_call, args){
     var method='GET';
 function asynchtml(url, $target, success, args){
     if(args===undefined){
         args=null;
+    }
     var $target = $('#' + container);
     $target.html(_TM['Loading ...']).css('opacity','0.3');
     // Set special header for partial ajax == HTTP_X_PARTIAL_XHR
     YUC.initHeader('X-PARTIAL-XHR',true);
     // wrapper of passed callback
     var s_wrapper = (function(o){
         return function(o){
             $target.html(o.responseText).css('opacity','1.0');
     $.ajax({url: url, data: args, headers: {'X-PARTIAL-XHR': '1'}, cache: false, dataType: 'html'})
         .done(function(html) {
                 $target.html(html);
                 $target.css('opacity','1.0');
             //execute the given original callback
             if (s_call !== undefined && s_call){
                 s_call();
                 if (success !== undefined && success) {
                     success();
+            }
+        }
     })()
     YUC.asyncRequest(method, url, {
         success: s_wrapper,
         failure: function(o){
             console.log('ypjax failure: '+o);
             $target.html('<span class="error_red">ERROR: {0}</span>'.format(o.status)).css('opacity','1.0');
         },
         cache:false
     },args);
             })
         .fail(function(jqXHR, textStatus, errorThrown) {
                 console.log('Ajax failure: ' + textStatus);
                 $target.html('<span class="error_red">ERROR: {0}</span>'.format(textStatus));
                 $target.css('opacity','1.0');
             })
+        ;
 };
 var ajaxGET = function(url,success) {
     // Set special header for ajax == HTTP_X_PARTIAL_XHR
     YUC.initHeader('X-PARTIAL-XHR',true);
     var sUrl = url;
     var callback = {
         success: success,
         failure: function (o) {
             if (o.status != 0) {
                 alert("Ajax GET error: " + o.statusText);
             };
         },
     };
     var request = YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
     return request;
 };
 var ajaxPOST = function(url,postData,success) {
     // Set special header for ajax == HTTP_X_PARTIAL_XHR
     YUC.initHeader('X-PARTIAL-XHR',true);
     var sUrl = url;
     var callback = {
         success: success,
         failure: function (o) {
             alert("Ajax POST error: " + o.statusText);
         },
     };
     var postData = _toQueryString(postData);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
     return request;
 };
 /**
  * activate .show_more links
  * the .show_more must have an id that is the the id of an element to hide prefixed with _
  * the parentnode will be displayed
  */
 var show_more_event = function(){
     $('.show_more').click(function(e){
         var el = e.currentTarget;
         $('#' + el.id.substring(1)).hide();
         $(el.parentNode).show();
     });
 };
 /**
  * activate .lazy-cs mouseover for showing changeset tooltip
  */
 var show_changeset_tooltip = function(){
     $('.lazy-cs').mouseover(function(e){
         var $target = $(e.currentTarget);
         var rid = $target.attr('raw_id');
         var repo_name = $target.attr('repo_name');
         if(rid && !$target.hasClass('tooltip')){
             _show_tooltip(e, _TM['loading ...']);
             var url = pyroutes.url('changeset_info', {"repo_name": repo_name, "revision": rid});
             ajaxGET(url, function(o){
                     var json = JSON.parse(o.responseText);
                     $target.addClass('tooltip')
                     _show_tooltip(e, json['message']);
                     _activate_tooltip($target);
                 });
+        }
     });
 };
 var _onSuccessFollow = function(target){
     var $target = $(target);
     var $f_cnt = $('#current_followers_count');
     if($target.hasClass('follow')){
         $target.attr('class', 'following');
         $target.attr('title', _TM['Stop following this repository']);
         if($f_cnt.html()){
             var cnt = Number($f_cnt.html())+1;
             $f_cnt.html(cnt);
+        }
+    }
     else{
         $target.attr('class', 'follow');
         $target.attr('title', _TM['Start following this repository']);
         if($f_cnt.html()){
             var cnt = Number($f_cnt.html())-1;
             $f_cnt.html(cnt);
+        }
+    }
+}
 var toggleFollowingRepo = function(target, follows_repo_id, token, user_id){
     args = 'follows_repo_id='+follows_repo_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     $.post(TOGGLE_FOLLOW_URL, args, function(data){
             _onSuccessFollow(target);
         });
     return false;
 };
 var showRepoSize = function(target, repo_name, token){
     var args= 'auth_token='+token;
     if(!$("#" + target).hasClass('loaded')){
         $("#" + target).html(_TM['Loading ...']);
         var url = pyroutes.url('repo_size', {"repo_name":repo_name});
         $.post(url, args, function(data) {
             $("#" + target).html(data);
             $("#" + target).addClass('loaded');
         });
+    }
     return false;
 };
 /**
  * tooltips
  */
 var tooltip_activate = function(){
     $(document).ready(_init_tooltip);
 };
 var _activate_tooltip = function($tt){
     $tt.mouseover(_show_tooltip);
     $tt.mousemove(_move_tooltip);
     $tt.mouseout(_close_tooltip);
 };
 var _init_tooltip = function(){
     var $tipBox = $('#tip-box');
     if(!$tipBox.length){
         $tipBox = $('<div id="tip-box"></div>')
         $(document.body).append($tipBox);
+    }
     $tipBox.hide();
     $tipBox.css('position', 'absolute');
     $tipBox.css('max-width', '600px');
     _activate_tooltip($('.tooltip'));
 };
 var _show_tooltip = function(e, tipText){
     e.stopImmediatePropagation();
     var el = e.currentTarget;
     if(tipText){
         // just use it
     } else if(el.tagName.toLowerCase() === 'img'){
         tipText = el.alt ? el.alt : '';
     } else {
         tipText = el.title ? el.title : '';
+    }
     if(tipText !== ''){
         // save org title
         $(el).attr('tt_title', tipText);
         // reset title to not show org tooltips
         $(el).attr('title', '');
         var $tipBox = $('#tip-box');
         $tipBox.html(tipText);
         $tipBox.css('display', 'block');
+    }
 };
 var _move_tooltip = function(e){
     e.stopImmediatePropagation();
     var $tipBox = $('#tip-box');
     $tipBox.css('top', (e.pageY + 15) + 'px');
     $tipBox.css('left', (e.pageX + 15) + 'px');
 };
 var _close_tooltip = function(e){
     e.stopImmediatePropagation();
     var $tipBox = $('#tip-box');
     $tipBox.hide();
     var el = e.currentTarget;
     $(el).attr('title', $(el).attr('tt_title'));
 };
 /**
  * Quick filter widget
+ *
  * @param target: filter input target
  * @param nodes: list of nodes in html we want to filter.
  * @param display_element function that takes current node from nodes and
  *    does hide or show based on the node
  */

kallithea/templates/admin/admin_log.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.users_log:
 <table>
     <tr>
         <th class="left">${_('Username')}</th>
         <th class="left">${_('Action')}</th>
         <th class="left">${_('Repository')}</th>
         <th class="left">${_('Date')}</th>
         <th class="left">${_('From IP')}</th>
     </tr>
     %for cnt,l in enumerate(c.users_log):
     <tr class="parity${cnt%2}">
         <td>
         %if l.user is not None:
           ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}
         %else:
           ${l.username}
         %endif
         </td>
         <td>${h.action_parser(l)[0]()}
             <div class="journal_action_params">
                 ${h.literal(h.action_parser(l)[1]())}
             </div>
         </td>
         <td>
             %if l.repository is not None:
               ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
             %else:
               ${l.repository_name}
             %endif
         </td>
         <td>${h.fmt_date(l.action_date)}</td>
         <td>${l.user_ip}</td>
     </tr>
     %endfor
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     var $user_log = $('#user_log');
     $user_log.on('click','.pager_link',function(e){
-      ypjax(e.target.href,"user_log",function(){
+      asynchtml(e.target.href, $user_log, function(){
         show_more_event();
         tooltip_activate();
         show_changeset_tooltip();
       });
       e.preventDefault();
     });
-    $('#user_log').on('click','.show_more',function(e){
     $user_log.on('click','.show_more',function(e){
       var el = e.target;
       $('#'+el.id.substring(1)).show();
       $(el.parentNode).hide();
     });
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.users_log.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
     ${_('No actions yet')}
 %endif

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('My Notifications')} ${c.authuser.username}
     %if c.site_name:
         &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Notifications')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
       <div style="padding:14px 18px;text-align: right;float:left">
       <span id='all' class="btn btn-mini"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="btn btn-mini"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
       <span id='pull_request' class="btn btn-mini"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
       </div>
       %if c.notifications:
       <div style="padding:14px 18px;text-align: right;float:right">
       <span id='mark_all_read' class="btn btn-mini">${_('Mark all read')}</span>
       </div>
       %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_action = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var run = function(){
   $('.delete-notification').click(function(e){
     var notification_id = e.currentTarget.id;
     deleteNotification(url_action,notification_id);
   });
   $('.read-notification').click(function(e){
     var notification_id = e.currentTarget.id;
     readNotification(url_action,notification_id);
   });
+}
 run();
 $('#mark_all_read').click(function(){
     var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
-    ypjax(url,'notification_data',function(){run()});
+    asynchtml(url, $('#notification_data'), function(){run();});
 });
 var current_filter = "${c.current_filter}";
 $('#'+current_filter).addClass('active');
 </script>
 </%def>

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'))), ''),
+ ]
 %>
 <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();
         ypjax("${h.url('admin_settings_system_update')}",
               "update_notice");
     })
         asynchtml("${h.url('admin_settings_system_update')}", $update_notice);
     });
 </script>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -23,385 +23,385 @@ @@
 <!-- END HEADER -->
 <!-- CONTENT -->
 <div id="content">
     ${self.flash_msg()}
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}
            </p>
            <p class="footer-link-right">
                This site is powered by
                %if c.visual.show_version:
                    <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
                %else:
                    <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
                %endif
                which is
                <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2014 by various authors &amp; licensed under GPLv3</a>.
                %if c.issues_url:
                    &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
                %endif
            </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="admin_menu()">
   <ul class="admin_menu">
       <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin journal')}</a></li>
       <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li>
       <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li>
       <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></i> ${_('Permissions')}</a></li>
       <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>
       <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li>
       <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-cog"></i> ${_('Settings')}</a></li>
   </ul>
 </%def>
 ## admin menu used for people that have some admin resources
 <%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
   <ul>
    %if repositories:
       <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>
    %endif
    %if repository_groups:
       <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User groups')}</a></li>
    %endif
   </ul>
 </%def>
 <%def name="repo_context_bar(current=None, rev=None)">
   <% rev = None if rev == 'tip' else rev %>
   <%
       def follow_class():
           if c.repository_following:
               return h.literal('following')
           else:
               return h.literal('follow')
   %>
   <%
     def is_current(selected):
         if selected == current:
             return h.literal('class="current"')
     %>
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
       <h2>
         %if h.is_hg(c.db_repo):
           <i class="icon-hg" style="color: #576622; font-size: 24px"></i>
         %endif
         %if h.is_git(c.db_repo):
           <i class="icon-git" style="color: #e85634; font-size: 24px"></i>
         %endif
         ## public/private
         %if c.db_repo.private:
           <i class="icon-lock"></i>
         %else:
           <i class="icon-unlock-alt"></i>
         %endif
         ${h.repo_link(c.db_repo.groups_and_repo)}
         %if current == 'createfork':
          - ${_('Create fork')}
         %endif
       </h2>
       <!--
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         &raquo;
         ${h.repo_link(c.db_repo.groups_and_repo)}
       </div>
       -->
       <ul id="context-pages" class="horizontal-list">
         <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-file-text"></i> ${_('Summary')}</a></li>
         %if rev:
         <li ${is_current('changelog')}><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-time"></i> ${_('Changelog')}</a></li>
         %else:
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-time"></i> ${_('Changelog')}</a></li>
         %endif
         <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-file"></i> ${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown"><i class="icon-random"></i> ${_('Switch To')}</a>
           <ul id="switch_to_list_2" class="switch_to submenu">
             <li><a href="#">${_('Loading...')}</a></li>
           </ul>
         </li>
         <li ${is_current('options')}>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>
              %else:
                <a href="#" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>
              %endif
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-cog"></i> ${_('Settings')}</a></li>
              %endif
               %if c.db_repo.fork:
                <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">
                    <i class="icon-loop"></i> ${_('Compare fork')}</a></li>
               %endif
               <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li>
               <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.db_repo.enable_locking:
                 %if c.db_repo.locked[0]:
                   <li>${h.link_to(_('Unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
                 %else:
                   <li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
                 %endif
               %endif
               ## TODO: this check feels wrong, it would be better to have a check for permissions
               ## also it feels like a job for the controller
               %if c.authuser.username != 'default':
                   <li>
                    <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.db_repo.repo_id},'${str(h.get_token())}');">
                     <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span>
                     <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>
                   </a>
                   </li>
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-code-fork"></i> ${_('Create Pull Request')}</a></li>
               %endif
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-code-fork"></i> ${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var $branch_tag_switcher_2 = $('#branch_tag_switcher_2');
          var loaded = $branch_tag_switcher_2.hasClass('loaded');
          if(!loaded){
              $branch_tag_switcher_2.addClass('loaded');
-             ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list_2');
+             asynchtml("${h.url('branch_tag_switcher',repo_name=c.repo_name)}", $('#switch_to_list_2'));
+         }
          return false;
       });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>
 <%def name="menu(current=None)">
   <%
   def is_current(selected):
       if selected == current:
           return h.literal('class="current"')
   %>
   <ul id="quick" class="horizontal-list">
     <!-- repo switcher -->
     <li ${is_current('repositories')}>
       <input id="repo_switcher" name="repo_switcher" type="hidden">
     </li>
     ##ROOT MENU
     %if c.authuser.username != 'default':
       <li ${is_current('journal')}>
         <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
           <i class="icon-book"></i> ${_('Journal')}
         </a>
       </li>
     %else:
       <li ${is_current('journal')}>
         <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
           <i class="icon-book"></i> ${_('Public journal')}
         </a>
       </li>
     %endif
       <li ${is_current('gists')}>
         <a class="menu_link childs" title="${_('Show public gists')}"  href="${h.url('gists')}">
           <i class="icon-file-2"></i> ${_('Gists')}
         </a>
           <ul class="admin_menu">
             <li><a href="${h.url('new_gist', public=1)}"><i class="icon-file-alt"></i> ${_('Create new gist')}</a></li>
             <li><a href="${h.url('gists')}"><i class="icon-copy"></i> ${_('All public gists')}</a></li>
             %if c.authuser.username != 'default':
               <li><a href="${h.url('gists', public=1)}"><i class="icon-copy"></i> ${_('My public gists')}</a></li>
               <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My private gists')}</a></li>
             %endif
           </ul>
       </li>
     <li ${is_current('search')}>
         <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
           <i class="icon-search"></i> ${_('Search')}
         </a>
     </li>
     % if h.HasPermissionAll('hg.admin')('access admin main page'):
       <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}" href="${h.url('admin_home')}">
           <i class="icon-cog"></i> ${_('Admin')}
         </a>
         ${admin_menu()}
       </li>
     % elif c.authuser.repositories_admin or c.authuser.repository_groups_admin or c.authuser.user_groups_admin:
     <li ${is_current('admin')}>
         <a class="menu_link childs" title="${_('Admin')}">
           <i class="icon-cog"></i> ${_('Admin')}
         </a>
         ${admin_menu_simple(c.authuser.repositories_admin,
                             c.authuser.repository_groups_admin,
                             c.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
     </li>
     % endif
     <li ${is_current('my_pullrequests')}>
       <a class="menu_link" title="${_('My Pull Requests')}" href="${h.url('my_pullrequests')}">
         <i class="icon-code-fork"></i> ${_('My Pull Requests')}
         %if c.my_pr_count != 0:
           <span class="menu_link_notifications">${c.my_pr_count}</span>
         %endif
       </a>
     </li>
     ## USER MENU
     <li>
       <a class="menu_link childs" id="quick_login_link">
           <span class="icon">
              <img src="${h.gravatar_url(c.authuser.email,20)}" alt="avatar">
           </span>
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
             %if c.unread_notifications != 0:
               <span class="menu_link_notifications">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not logged in')}</span>
           %endif
       </a>
       <div class="user-menu">
         <div id="quick_login">
           %if c.authuser.username == 'default' or c.authuser.user_id is None:
             <h4>${_('Login to your account')}</h4>
             ${h.form(h.url('login_home',came_from=h.url.current()))}
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus')}
                         </div>
                     </div>
                     <div class="buttons">
                         <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="btn btn-mini")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
           %else:
             <div class="links_left">
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.authuser.email,48)}" /></div>
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>
             <div class="links_right">
             <ol class="links">
               <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li>
               <li>${h.link_to(_(u'My account'),h.url('my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
           %endif
         </div>
       </div>
     </li>
     <script type="text/javascript">
         var visual_show_public_icon = "${c.visual.show_public_icon}" == "True";
         var cache = {}
         /*format the look of items in the list*/
         var format = function(state){
             if (!state.id){
               return state.text; // optgroup
+            }
             var obj_dict = state.obj;
             var tmpl = '';
             if(obj_dict && state.type == 'repo'){
                 tmpl += '<span class="repo-icons">';
                 if(obj_dict['repo_type'] === 'hg'){
                     tmpl += '<i class="icon-hg"></i> ';
+                }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<i class="icon-git"></i> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-lock" style="color: #e85634;"></i> ';
+                }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-unlock-alt"></i> ';
+                }
                 tmpl += '</span>';
+            }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder-close"></i> ';
+            }
             tmpl += state.text;
             return tmpl;
+        }
         $("#repo_switcher").select2({
             placeholder: '<i class="icon-archive"></i> ${_('Repositories')}',
             dropdownAutoWidth: true,
             formatResult: format,
             formatSelection: format,
             formatNoMatches: function(term){

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.repo_changesets:
 <table class="table_disp">
     <tr>
         <th class="left">${_('Revision')}</th>
         <th class="left">${_('Commit message')}</th>
         <th class="left">${_('Age')}</th>
         <th class="left">${_('Author')}</th>
         <th class="left">${_('Refs')}</th>
     </tr>
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2}">
         <td>
           <div>
             <div class="changeset-status-container">
               %if c.statuses.get(cs.raw_id):
                 <div class="changeset-status-ico shortlog">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                     <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                   </a>
                 %else:
                   <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                 %endif
                 </div>
               %endif
               %if c.comments.get(cs.raw_id,[]):
                <div class="comments-container">
                    <div title="${('comments')}">
                        <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                           <i class="icon-comment-alt icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
                        </a>
                    </div>
                </div>
               %endif
             </div>
             <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
          </div>
         </td>
         <td>
             ${h.urlify_commit(h.truncate(cs.message,50),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
         </td>
         <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">
                       ${h.age(cs.date)}</span>
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <td>
             %if h.is_hg(c.db_repo_scm_instance):
                 %for book in cs.bookmarks:
                     <div class="booktag" title="${_('Bookmark %s') % book}">
                         ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </div>
                 %endfor
             %endif
             %for tag in cs.tags:
              <div class="tagtag" title="${_('Tag %s') % tag}">
                  ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
              </div>
             %endfor
             %if cs.branch:
              <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                  ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
              </div>
             %endif
         </td>
     </tr>
 %endfor
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     var $shortlog_data = $('#shortlog_data');
     $shortlog_data.on('click','.pager_link',function(e){
-      ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
+      asynchtml(e.target.href, $shortlog_data, function(){tooltip_activate();});
       e.preventDefault();
     });
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <h4>${_('Add or upload files directly via Kallithea')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
       <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
   </div>
 </div>
 %endif
 <h4>${_('Push new repo')}</h4>
 <pre>
     ${c.db_repo_scm_instance.alias} clone ${c.clone_repo_url}
     ${c.db_repo_scm_instance.alias} add README # add first file
     ${c.db_repo_scm_instance.alias} commit -m "Initial" # commit with message
     ${c.db_repo_scm_instance.alias} push ${'origin master' if h.is_git(c.db_repo_scm_instance) else ''} # push changes back
 </pre>
 <h4>${_('Existing repository?')}</h4>
 <pre>
 %if h.is_git(c.db_repo_scm_instance):
     git remote add origin ${c.clone_repo_url}
     git push -u origin master
 %else:
     hg push ${c.clone_repo_url}
 %endif
 </pre>
 %endif

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -25,233 +25,233 @@ @@
 <%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('//','/')
         //extract rev and the f_path from 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 function on top
         var title = "${_('%s Files') % c.repo_name}" + " &middot; " + (f_path || '\\') + " &middot; " + "${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 pjax 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 = {}
     $("#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})
+                    }
                 })
                 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()
+            }
         })
     })
+}
 $(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{
-            ypjax(State.url, container, function(){
+            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;
         if(selected && selected != "${c.changeset.raw_id}"){
             window.location = pyroutes.url('files_home', {'repo_name': "${h.safe_unicode(c.repo_name)}", 'revision': selected, 'f_path': "${h.safe_unicode(c.file.path)}"});
             $("#browserblock").hide();
         } else {
             $("#branch_selector").val("${c.changeset.raw_id}");
+        }
     });
 });
 </script>
 </%def>

kallithea/templates/followers/followers_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for f in c.followers_pager:
     <div>
         <div class="follower_user">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
             </div>
             <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
         <div style="clear:both;padding-top: 10px"></div>
         <div class="follower_date">${_('Started following -')}
         <span class="tooltip" title="${h.tooltip(f.follows_from)}"> ${h.age(f.follows_from)}</span></div>
         <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
     </div>
 % endfor
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
 $(document).ready(function(){
     var $followers = $('#followers');
     $followers.on('click','.pager_link',function(e){
-        ypjax(e.target.href,"followers",function(){
+        asynchtml(e.target.href, $followers, function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
         });
         e.preventDefault();
     });
 });
 </script>
 ${c.followers_pager.pager('$link_previous ~2~ $link_next')}
 </div>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % if c.forks_pager:
     % for f in c.forks_pager:
         <div>
             <div class="fork_user">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(f.user.email,24)}"/>
                 </div>
                 <span style="font-size: 20px">
                  <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
                   ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
                 </span>
                 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
             </div>
             <div style="clear:both;padding-top: 10px"></div>
             <div class="follower_date">${_('Forked')} -
                 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s' % c.repo_name)}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
                    class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </div>
     % endfor
   <div class="pagination-wh pagination-left">
   <script type="text/javascript">
   $(document).ready(function(){
       var $forks = $('#forks');
       $forks.on('click','.pager_link',function(e){
-          ypjax(e.target.href,"forks",function(){
+          asynchtml(e.target.href, $forks, function(){
               show_more_event();
               tooltip_activate();
               show_changeset_tooltip();
           });
           e.preventDefault();
       });
   });
   </script>
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}
   </div>
 % else:
     ${_('There are no forks yet')}
 % endif

kallithea/templates/journal/journal.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')}
     %if c.site_name:
         &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs()">
     <h5>
     <form id="filter_form">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>
     <input type='submit' value="${_('filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/>
     ${_('journal')} - ${ungettext('%s entry', '%s entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     ${h.end_form()}
     </h5>
 </%def>
 <%def name="page_nav()">
     ${self.menu('journal')}
 </%def>
 <%def name="head_extra()">
 <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
 <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
 </%def>
 <%def name="main()">
     <div class="box box-left">
         <!-- box / title -->
         <div class="title">
          ${self.breadcrumbs()}
          <ul class="links icon-only-links">
            <li>
              <span><a id="refresh" href="${h.url('journal')}"><i class="icon-refresh"></i></a></span>
            </li>
            <li>
              <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-sign"></i></a></span>
            </li>
          </ul>
         </div>
         <div id="journal">${c.journal_data}</div>
     </div>
     <div class="box box-right">
         <!-- box / title -->
         <div class="title">
             <h5>
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>
             <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>
             </h5>
             <ul class="links nav nav-tabs">
                 <li class="active" id="show_watched_li">
                     <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a>
                 </li>
                 <li id="show_my_li">
                     <a id="show_my" href="#my"><i class="icon-archive"></i> ${_('My repos')}</a>
                </li>
             </ul>
         </div>
         <!-- end box / title -->
         <div id="my_container" style="display:none">
             <div class="table-grid table yui-skin-sam" id="repos_list_wrap"></div>
             <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
         <div id="watched_container">
             <div class="table-grid table yui-skin-sam" id="watched_repos_list_wrap"></div>
             <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
     </div>
     <script type="text/javascript">
     $('#j_filter').click(function(){
         var $jfilter = $('#j_filter');
         if($jfilter.hasClass('initial')){
             $jfilter.val('');
+        }
     });
     var fix_j_filter_width = function(len){
         $('#j_filter').css('width', Math.max(80, len*6.50)+'px');
     };
     $('#j_filter').keyup(function(){
         fix_j_filter_width($('#j_filter').val().length);
     });
     $('#filter_form').submit(function(e){
         e.preventDefault();
         var val = $('#j_filter').val();
         window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
     });
     fix_j_filter_width($('#j_filter').val().length);
     $('#refresh').click(function(e){
-        ypjax("${h.url.current(filter=c.search_term)}","journal",function(){
+        asynchtml("${h.url.current(filter=c.search_term)}", $("#journal"), function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         e.preventDefault();
     });
     var show_my = function(e){
         $('#watched_container').hide();
         $('#my_container').show();
         $('#q_filter').show();
         $('#q_filter_watched').hide();
         $('#show_my_li').addClass('active');
         $('#show_watched_li').removeClass('active');
         if(!$('#show_my').hasClass('loaded')){
             table_renderer(${c.data |n});
             $('#show_my').addClass('loaded');
+        }
     };
     $('#show_my').click(function(){
         show_my();
     });
     var show_watched = function(){
         $('#my_container').hide();
         $('#watched_container').show();
         $('#q_filter_watched').show();
         $('#q_filter').hide();
         $('#show_watched_li').addClass('active');
         $('#show_my_li').removeClass('active');
         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)
                     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)
                     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']),

kallithea/templates/journal/journal_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.journal_day_aggreagate:
     %for day,items in c.journal_day_aggreagate:
      <div class="journal_day">${day}</div>
         % for user,entries in items:
             <div class="journal_container">
                 <div class="gravatar">
                     <img alt="gravatar" src="${h.gravatar_url(user.email if user else 'anonymous@kallithea-scm.org',24)}"/>
                 </div>
                 %if user:
                    <div class="journal_user">${user.name} ${user.lastname}</div>
                 %else:
                     <div class="journal_user deleted">${entries[0].username}</div>
                 %endif
                 <div class="journal_action_container">
                 % for entry in entries:
                     <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
                     <div class="journal_action">${h.action_parser(entry)[0]()}</div>
                     <div class="journal_repo">
                         <span class="journal_repo_name">
                         %if entry.repository is not None:
                           ${h.link_to(entry.repository.repo_name,
                                       h.url('summary_home',repo_name=entry.repository.repo_name))}
                         %else:
                           ${entry.repository_name}
                         %endif
                         </span>
                     </div>
                     <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
                     <div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div>
                 %endfor
                 </div>
             </div>
         %endfor
     %endfor
   <div class="pagination-wh pagination-left" style="padding: 0px 0px 0px 10px;">
   ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
   </div>
     <script type="text/javascript">
     $(document).ready(function(){
         var $journal = $('#journal');
         $journal.on('click','.pager_link',function(e){
-            ypjax(e.target.href,"journal",function(){
+            asynchtml(e.target.href, $journal, function(){
                 show_more_event();
                 tooltip_activate();
                 show_changeset_tooltip();
             });
             e.preventDefault();
         });
         $('#journal').on('click','.show_more',function(e){
             var el = e.target;
             $('#'+el.id.substring(1)).show();
             $(el.parentNode).hide();
         });
     });
     </script>
 %else:
   <div style="padding:5px 0px 10px 10px;">
       ${_('No entries yet')}
   </div>
 %endif

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -28,233 +28,233 @@ ${self.repo_context_bar('showpullrequest @@
              <div class="field">
                 <div class="label">
                     <label for="pullrequest_title">${_('Title')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="pullrequest_desc">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="pullrequest_desc">${_('Changeset flow')}:</label>
                 </div>
                 <div class="input">
                     ##ORG
                     <div>
                         <div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
                             </div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     ##OTHER, most Probably the PARENT OF THIS FORK
                     <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
                         <div>
                             ## filled with JS
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}
                             </div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     <div style="clear:both"></div>
                 </div>
             </div>
             <div class="field">
                 <div class="buttons">
                     ${h.submit('save',_('Create Pull Request'),class_="btn")}
                     ${h.reset('reset',_('Reset'),class_="btn")}
                </div>
             </div>
         </div>
         ## Reviewers
         <div style="float:left; border-left:1px dashed #eee">
             <div class="pr-details-title">${_('Pull request reviewers')}</div>
             <div id="reviewers" style="padding:0px 0px 0px 15px">
               ## members goes here !
               <div>
                 <ul id="review_members" class="group_members">
                 %for member in [c.a_repo.user]:
                   <li id="reviewer_${member.user_id}">
                     <div class="reviewers_member">
                       <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email, 14)}"/> </div>
                       <div style="float:left">${member.firstname} ${member.lastname} (${_('owner')})</div>
                       <input type="hidden" value="${member.user_id}" name="review_members" />
                       <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}>
                           <i class="icon-remove-sign" style="color: #FF4444;"></i>
                       </span>
                     </div>
                   </li>
                 %endfor
                 </ul>
               </div>
               <div class='ac'>
                 <div class="reviewer_ac">
                    ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
                    <div id="reviewers_container"></div>
                 </div>
               </div>
             </div>
         </div>
         <div style="clear:both;padding: 0 0 30px 0;"></div>
         <h4>${_('Changesets')}</h4>
         <div style="float:left;padding:0px 30px 30px 30px">
            ## overview pulled by ajax
            <div style="float:left" id="pull_request_overview"></div>
         </div>
         <div style="clear:both;"></div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
 <script type="text/javascript">
   var _USERS_AC_DATA = ${c.users_array|n};
   var _GROUPS_AC_DATA = ${c.user_groups_array|n};
   PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
   pyroutes.register('pullrequest_repo_info', "${url('pullrequest_repo_info',repo_name='%(repo_name)s')}", ['repo_name']);
   var otherrepoChanged = function(){
       var repo_name = $('#other_repo').val();
       ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),
           function(o){
               var data = JSON.parse(o.responseText);
               $('#other_repo_desc').html(data.description);
               // replace options of other_ref with the ones for the current other_repo
               var $other_ref = $('#other_ref');
               $other_ref.empty();
               for(var i = 0; i < data.refs.length; i++)
+              {
                 var $optgroup = $('<optgroup/>').attr('label', data.refs[i][1]);
                 var options = data.refs[i][0];
                 var length = options.length;
                 for(var j = 0; j < length; j++)
+                {
                   $optgroup.append($('<option/>').text(options[j][1]).val(options[j][0]));
+                }
                 $other_ref.append($optgroup);
+              }
               $other_ref.val(data.selected_ref);
               // reset && add the reviewer based on selected repo
               YUD.get('review_members').innerHTML = '';
               addReviewMember(data.user.user_id, data.user.firstname,
                               data.user.lastname, data.user.username,
                               data.user.gravatar_link);
               // re-populate the select2 thingie
               $("#other_ref").select2({
                   dropdownAutoWidth: true,
               });
               loadPreview();
           });
   };
   var loadPreview = function(){
       //url template
       var url = "${h.url('compare_url',
                          repo_name='__other_repo__',
                          org_ref_type='rev',
                          org_ref_name='__other_ref_name__',
                          other_repo='__org_repo__',
                          other_ref_type='rev',
                          other_ref_name='__org_ref_name__',
                          as_form=True,
                          merge=True,
                          )}";
       var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
       var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
       ## TODO: make nice link like link_to_ref() do
       YUD.get('org_rev_span').innerHTML = org_ref[2].substr(0,12);
       var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
       var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
       YUD.get('other_rev_span').innerHTML = other_ref[2].substr(0,12);
       var select_refs = YUQ('#pull_request_form select.refs')
       var rev_data = {
           '__org_repo__': org_repo,
           '__org_ref_name__': org_ref[2],
           '__other_repo__': other_repo,
           '__other_ref_name__': other_ref[2],
       }; // gather the org/other ref and repo here
       for (k in rev_data){
           url = url.replace(k,rev_data[k]);
+      }
       ypjax(url,'pull_request_overview', function(o){
           var jsdata = eval('('+YUD.get('jsdata').innerHTML+')');
       asynchtml(url, $('#pull_request_overview'), function(o){
           var jsdata = eval('('+YUD.get('jsdata').innerHTML+')'); // TODO: just get json
           var r = new BranchRenderer('graph_canvas', 'graph_content_pr');
           r.render(jsdata,100);
       });
+  }
   $(document).ready(function(){
       $("#org_repo").select2({
           dropdownAutoWidth: true,
       });
       ## (org_repo can't change)
       $("#org_ref").select2({
           dropdownAutoWidth: true,
       });
       $("#org_ref").on("change", function(e){
           loadPreview();
       });
       $("#other_repo").select2({
           dropdownAutoWidth: true,
       });
       $("#other_repo").on("change", function(e){
           otherrepoChanged();
       });
       $("#other_ref").select2({
           dropdownAutoWidth: true,
       });
       $("#other_ref").on("change", function(e){
           loadPreview();
       });
       //lazy load overview after 0.5s
       setTimeout(loadPreview, 500);
   });
 </script>
 </%def>

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('My Pull Requests')} &middot; ${c.site_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Pull Requests')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('my_pullrequests')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div id="pullrequests_container" class="table">
         ## loaded via AJAX
         ${_('Loading...')}
     </div>
 <script type="text/javascript">
 pyroutes.register('my_pullrequests_data', "${url('my_pullrequests_data')}", []);
 var show_pullrequests = function(e){
     var url = pyroutes.url('my_pullrequests_data');
     if ($('#show_closed').prop('checked')) {
         var url = pyroutes.url('my_pullrequests_data', {'pr_show_closed': '1'});
+    }
-    ypjax(url, 'pullrequests_container', function(){
+    asynchtml(url, $('#pullrequests_container'), function(){
         // new #show_closed has just been loaded
         $('#show_closed').change(function (e) {
             show_pullrequests(e);
         });
     });
+}
 show_pullrequests()
 </script>
 </div>
 </%def>

0 comments (0 inline, 0 general)