kallithea Changeset - 7967d00e4692

Changeset - 7967d00e4692

Parent rev.

Child rev.

[Not reviewed]

beta

0 13 0

Mads Kiilerich - 13 years ago 2013-03-19 21:47:34
madski@unity3d.com

Transplanted from: 6be5c256fb9b

Stylistic cleanup - mostly formatting

8 files changed with 3 insertions and 19 deletions:

rhodecode/lib/base.py

rhodecode/lib/utils2.py

rhodecode/public/css/contextbar.css

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

rhodecode/templates/base/base.html

rhodecode/templates/base/root.html

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -269,71 +269,70 @@ class BaseController(WSGIController): @@
         c.repo_name = get_repo_slug(request)
         c.backends = BACKENDS.keys()
         c.unread_notifications = NotificationModel()\
                         .get_unread_cnt_for_user(c.rhodecode_user.user_id)
         self.cut_off_limit = int(config.get('cut_off_limit'))
         self.sa = meta.Session
         self.scm_model = ScmModel(self.sa)
     def __call__(self, environ, start_response):
         """Invoke the Controller"""
         # WSGIController.__call__ dispatches to the Controller method
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
         try:
             self.ip_addr = _get_ip_addr(environ)
             # make sure that we update permissions each time we call controller
             api_key = request.GET.get('api_key')
             cookie_store = CookieStoreWrapper(session.get('rhodecode_user'))
             user_id = cookie_store.get('user_id', None)
             username = get_container_username(environ, config)
             auth_user = AuthUser(user_id, api_key, username, self.ip_addr)
             request.user = auth_user
             self.rhodecode_user = c.rhodecode_user = auth_user
             if not self.rhodecode_user.is_authenticated and \
                        self.rhodecode_user.user_id is not None:
                 self.rhodecode_user.set_authenticated(
                     cookie_store.get('is_authenticated')
+                )
             log.info('IP: %s User: %s accessed %s' % (
                self.ip_addr, auth_user, safe_unicode(_get_access_path(environ)))
+            )
             return WSGIController.__call__(self, environ, start_response)
         finally:
             meta.Session.remove()
 class BaseRepoController(BaseController):
     """
     Base class for controllers responsible for loading all needed data for
     repository loaded items are
     c.rhodecode_repo: instance of scm repository
     c.rhodecode_db_repo: instance of db
     c.repository_followers: number of followers
     c.repository_forks: number of forks
     c.repository_following: weather the current user is following the current repo
     """
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:
             dbr = c.rhodecode_db_repo = Repository.get_by_repo_name(c.repo_name)
             c.rhodecode_repo = c.rhodecode_db_repo.scm_instance
             # update last change according to VCS data
             dbr.update_changeset_cache(dbr.get_changeset())
             if c.rhodecode_repo is None:
                 log.error('%s this repository is present in database but it '
                           'cannot be created as an scm instance', c.repo_name)
                 redirect(url('home'))
             # some globals counter for menu
             c.repository_followers = self.scm_model.get_followers(dbr)
             c.repository_forks = self.scm_model.get_forks(dbr)
             c.repository_pull_requests = self.scm_model.get_pull_requests(dbr)
             c.repository_following = self.scm_model.is_following_repo(c.repo_name,
                                                 self.rhodecode_user.user_id)

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -310,97 +310,96 @@ def engine_from_config(configuration, pr @@
         from sqlalchemy.pool import NullPool
         url = configuration[prefix + 'url']
         if url.startswith('sqlite'):
             kwargs.update({'poolclass': NullPool})
         return efc(configuration, prefix, **kwargs)
     else:
         import time
         from sqlalchemy import event
         from sqlalchemy.engine import Engine
         log = logging.getLogger('sqlalchemy.engine')
         BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
         engine = efc(configuration, prefix, **kwargs)
         def color_sql(sql):
             COLOR_SEQ = "\033[1;%dm"
             COLOR_SQL = YELLOW
             normal = '\x1b[0m'
             return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal])
         if configuration['debug']:
             #attach events only for debug configuration
             def before_cursor_execute(conn, cursor, statement,
                                     parameters, context, executemany):
                 context._query_start_time = time.time()
                 log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
             def after_cursor_execute(conn, cursor, statement,
                                     parameters, context, executemany):
                 total = time.time() - context._query_start_time
                 log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total))
             event.listen(engine, "before_cursor_execute",
                          before_cursor_execute)
             event.listen(engine, "after_cursor_execute",
                          after_cursor_execute)
     return engine
 def age(prevdate, show_short_version=False):
     """
     turns a datetime into an age string.
     If show_short_version is True, then it will generate a not so accurate but shorter string,
     example: 2days ago, instead of 2 days and 23 hours ago.
     :param prevdate: datetime object
     :param show_short_version: if it should aproximate the date and return a shorter string
     :rtype: unicode
     :returns: unicode words describing age
     """
     now = datetime.datetime.now()
     now = now.replace(microsecond=0)
     order = ['year', 'month', 'day', 'hour', 'minute', 'second']
     deltas = {}
     future = False
     if prevdate > now:
         now, prevdate = prevdate, now
         future = True
     # Get date parts deltas
     for part in order:
         if future:
             from dateutil import relativedelta
             d = relativedelta.relativedelta(now, prevdate)
             deltas[part] = getattr(d, part + 's')
         else:
             deltas[part] = getattr(now, part) - getattr(prevdate, part)
     # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
     # not 1 hour, -59 minutes and -59 seconds)
     for num, length in [(5, 60), (4, 60), (3, 24)]:  # seconds, minutes, hours
         part = order[num]
         carry_part = order[num - 1]
         if deltas[part] < 0:
             deltas[part] += length
             deltas[carry_part] -= 1
     # Same thing for days except that the increment depends on the (variable)
     # number of days in the month
     month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     if deltas['day'] < 0:
         if prevdate.month == 2 and (prevdate.year % 4 == 0 and
             (prevdate.year % 100 != 0 or prevdate.year % 400 == 0)):
             deltas['day'] += 29
         else:
             deltas['day'] += month_lengths[prevdate.month - 1]
         deltas['month'] -= 1
     if deltas['month'] < 0:
         deltas['month'] += 12

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -117,187 +117,188 @@ ul.horizontal-list li a { @@
 }
 #breadcrumbs span {
     font-weight: bold;
     font-size: 1.8em;
 }
 #context-top {
     position: relative;
     overflow: hidden;
     border-bottom: 1px solid #003162;
     padding: 5px;
 }
 #header #header-inner #quick ul,
 #revision-changer,
 #context-pages,
 #context-pages ul {
     background: #3b6998; /* Old browsers */
     background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */
     background: -webkit-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Chrome10+,Safari5.1+ */
     background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */
     background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */
     background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */
     /*Filter on IE will also use overflow:hidden implicitly, and that would clip our inner menus.*/
     /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/
 }
 #header #header-inner #quick a,
 #context-actions a,
 #context-pages a {
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-left: 30px;
 }
 #quick a,
 #context-pages ul ul a {
     padding-left: 10px;
 }
 ul#context-actions {
     display: inline-block;
     float: right;
     border-radius: 4px;
     background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
 }
 #content ul#context-actions li {
     padding: 0px;
     border-right: 1px solid rgba(0,0,0,0.1);
     border-left: 1px solid rgba(255,255,255,0.1);
 }
 #context-actions button,
 #context-actions a {
     display: block;
     cursor: pointer;
     background: none;
     border: none;
     margin: 0px;
     height: auto;
     padding: 10px 10px 10px 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     font-size: 1em;
 }
 #context-actions a {
     padding: 11px 10px 12px 30px;
 }
 #header #header-inner #quick li:hover,
 #revision-changer:hover,
 #context-pages li:hover,
 #context-actions li:hover,
 #content #context-actions li:hover,
 #header #header-inner #quick li.current,
 #context-pages li.current {
     background: #6388ad; /* Old browsers */
     background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
     background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
     background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
     background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
     background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
     /*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
 }
 #content #context-actions li:first-child {
     border-left: none;
     border-radius: 4px 0 0px 4px;
 }
 #content #context-actions li:last-child {
     border-right: none;
     border-radius: 0 4px 4px 0;
 }
 #content  #context-actions .icon {
     margin: auto;
     margin-bottom: 5px;
     display: block;
     clear: both;
     float: none;
 }
 #content  #context-actions button.follow,
 #content  #context-actions button.following {
     width: auto;
     float: none;
 }
 #content  #context-actions button .show-following,
 #content  #context-actions button .show-follow {
     display: none;
 }
 #content #context-bar #context-actions button.follow .show-follow {
     display: block;
 }
 #content #context-bar #context-actions button.following .show-following {
     display: block;
 }
 #context-state {
     background-color: #336699;
     border-top: 1px solid #517da8;
     min-height: 36px;
 }
 #context-pages {
     float: right;
     border-left: 1px solid rgba(0,0,0,0.1);
 }
-#context-pages li.curreasdnt {
+#context-pages li.current {
     background: #535353; /* Old browsers */
     background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */
     background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */
     background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */
     background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */
     background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */
 }
 #content #context-pages .icon {
     margin-right: 5px;
 }
 #header #header-inner #quick li,
 #content #context-pages li {
     border-right: 1px solid rgba(0,0,0,0.1);
     border-left: 1px solid rgba(255,255,255,0.1);
     padding: 0;
 }
 #header #header-inner #quick li:last-child,
 #content #context-pages li:last-child {
     border-right: none;
 }
 #header #header-inner #quick > li:first-child {
     border-left: none;
 }
 #header #header-inner #quick > li:first-child > a {
     border-radius: 4px 0 0 4px;
 }
 #header #header-inner #quick a,
 #context-pages a,
 #context-pages .admin_menu a {
     display: block;
     padding: 0px 10px 1px 30px;
     padding-left: 30px;
     line-height: 35px;
 }
 #header #header-inner #quick a.thin,
 #context-pages a.thin,
 #context-pages .admin_menu a.thin {
     line-height: 28px !important;
 }
 #header #header-inner #quick a#quick_login_link {

rhodecode/public/css/style.css

➞

Show inline comments

@@ modified file chmod 100644 => 100755 @@
@@ @@ -376,97 +376,96 @@ div:hover > a.permalink { @@
+}
 #header #header-inner #logo {
     float: left;
     position: absolute;
+}
 #header #header-inner #logo h1 {
     color: #FFF;
     font-size: 20px;
     margin: 12px 0 0 13px;
     padding: 0;
+}
 #header #header-inner #logo a {
     color: #fff;
     text-decoration: none;
+}
 #header #header-inner #logo a:hover {
     color: #bfe3ff;
+}
 #header #header-inner #quick {
     position: relative;
     float: right;
     list-style-type: none;
     list-style-position: outside;
     margin: 4px 8px 0 0;
     padding: 0;
     border-radius: 4px;
+}
 #header #header-inner #quick li span.short {
     padding: 9px 6px 8px 6px;
+}
 #header #header-inner #quick li span {
     display: inline;
     margin: 0;
+}
 #header #header-inner #quick li span.normal {
     border: none;
     padding: 10px 12px 8px;
+}
 #header #header-inner #quick li span.icon {
     border-left: none;
     padding-left: 10px ;
+}
 #header #header-inner #quick li span.icon_short {
     top: 0;
     left: 0;
     border-left: none;
     border-right: 1px solid #2e5c89;
     padding: 8px 6px 4px;
+}
 #header #header-inner #quick li span.icon img, #header #header-inner #quick li span.icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
+}
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
     overflow-y: auto;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs {
     padding: 2px 3px;
     padding-right: 17px;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs  input {
     width: 100%;
     border-radius: 10px;
     padding: 2px 7px;
+}
 #header #header-inner #quick .repo_switcher_type {
     position: absolute;
     left: 0;
     top: 9px;
     margin: 0px 2px 0px 2px;
+}
 #header #header-inner #quick li ul li a.journal, #header #header-inner #quick li ul li a.journal:hover {
     background-image: url("../images/icons/book.png");
+}
 #header #header-inner #quick li ul li a.private_repo, #header #header-inner #quick li ul li a.private_repo:hover {
     background-image: url("../images/icons/lock.png")
+}
@@ @@ -1680,97 +1679,96 @@ div.form div.fields div.field div.button @@
 #content div.box #summary {
     margin-right: 200px;
+}
 #summary-menu-stats {
     float: left;
     width: 180px;
     position: absolute;
     top: 0;
     right: 0;
+}
 #summary-menu-stats ul {
     margin: 0 10px;
     display: block;
     background-color: #f9f9f9;
     border: 1px solid #d1d1d1;
     border-radius: 4px;
+}
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #content #summary-menu-stats li:first-child {
     border-top: none;
+}
 #summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
 #summary-menu-stats a.forks { background-image: url('../images/icons/arrow_divide.png')}
 #summary-menu-stats a.settings { background-image: url('../images/icons/cog_edit.png')}
 #summary-menu-stats a.feed { background-image: url('../images/icons/rss_16.png')}
 #summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
 #summary-menu-stats a {
     display: block;
     padding: 12px 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-right: 10px;
+}
 #repo_size_2 {
     margin-left: 30px;
     display: block;
     padding-right: 10px;
     padding-bottom: 7px;
+}
 #summary-menu-stats a:hover {
     text-decoration: none;
+}
 #summary-menu-stats a span {
     background-color: #DEDEDE;
     color: 888 !important;
     border-radius: 4px;
     padding: 2px 4px;
     font-size: 10px;
+}
 #summary .metatag {
     display: inline-block;
     padding: 3px 5px;
     margin-bottom: 3px;
     margin-right: 1px;
     border-radius: 5px;
+}
 #content div.box #summary p {
     margin-bottom: -5px;
     width: 600px;
     white-space: pre-wrap;
+}
 #content div.box #summary p:last-child {
     margin-bottom: 9px;
+}
 #content div.box #summary p:first-of-type {
     margin-top: 9px;
+}
 .metatag {
     display: inline-block;
     margin-right: 1px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
@@ @@ -2469,100 +2467,96 @@ h3.files_location { @@
+}
 .table {
     position: relative;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
+}
 #graph_content,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content .container {
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content .container .author {
    width: 105px;
+}
 #graph_content .container .hash {
     width: 100px;
     font-size: 0.85em;
+}
 #graph_content #changesets .container .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content #changesets .container .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content .container .mid {
     padding: 0;
+}
 #graph_content .log-container {
     position: relative;
+}
 #graph_content #changesets td.checkbox {
     width: 20px;
+}
 #graph_content .container .changeset_range {
     float: left;
     margin: 6px 3px;
+}

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -531,97 +531,96 @@ var onSuccessFollow = function(target){ @@
+    }
+}
 var toggleFollowingUser = function(target,fallows_user_id,token,user_id){
     args = 'follows_user_id='+fallows_user_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{
         success:function(o){
         	onSuccessFollow(target);
+        }
     },args);
     return false;
+}
 var toggleFollowingRepo = function(target,fallows_repo_id,token,user_id){
     args = 'follows_repo_id='+fallows_repo_id;
     args+= '&amp;auth_token='+token;
     if(user_id != undefined){
         args+="&amp;user_id="+user_id;
+    }
     YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{
         success:function(o){
         	onSuccessFollow(target);
+        }
     },args);
     return false;
+}
 var showRepoSize = function(target, repo_name, token){
     var args= 'auth_token='+token;
     if(!YUD.hasClass(target, 'loaded')){
         YUD.get(target).innerHTML = _TM['Loading ...'];
         var url = pyroutes.url('repo_size', {"repo_name":repo_name});
         YUC.asyncRequest('POST',url,{
             success:function(o){
             	YUD.get(target).innerHTML = JSON.parse(o.responseText);
             	YUD.addClass(target, 'loaded');
+            }
         },args);
+    }
     return false;
+}
 /**
  * TOOLTIP IMPL.
  */
 YAHOO.namespace('yuitip');
 YAHOO.yuitip.main = {
 	$:			YAHOO.util.Dom.get,
 	bgColor:	'#000',
 	speed:		0.3,
 	opacity:	0.9,
 	offset:		[15,15],
 	useAnim:	false,
 	maxWidth:	600,
 	add_links:	false,
 	yuitips:    [],
 	set_listeners: function(tt){
 		YUE.on(tt, 'mouseover', yt.show_yuitip,  tt);
 		YUE.on(tt, 'mousemove', yt.move_yuitip,  tt);
 		YUE.on(tt, 'mouseout',  yt.close_yuitip, tt);
 	},
 	init: function(){
 		yt.tipBox = yt.$('tip-box');
 		if(!yt.tipBox){
 			yt.tipBox = document.createElement('div');
 			document.body.appendChild(yt.tipBox);
 			yt.tipBox.id = 'tip-box';
+		}
 		YUD.setStyle(yt.tipBox, 'display', 'none');
 		YUD.setStyle(yt.tipBox, 'position', 'absolute');
 		if(yt.maxWidth !== null){
 			YUD.setStyle(yt.tipBox, 'max-width', yt.maxWidth+'px');
+		}
 		var yuitips = YUD.getElementsByClassName('tooltip');
 		if(yt.add_links === true){
 			var links = document.getElementsByTagName('a');
 			var linkLen = links.length;
 			for(i=0;i<linkLen;i++){
 				yuitips.push(links[i]);
+			}
+		}
 		var yuiLen = yuitips.length;

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -38,146 +38,142 @@ @@
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
            <p class="footer-link-right">
                <a href="${h.url('rhodecode_official')}">RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''}</a>
                ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
            </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="page_nav()">
     ${self.menu()}
 </%def>
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="context_bar(current=None)">
    %if c.repo_name:
     ${repo_context_bar(current)}
    %endif
 </%def>
 <%def name="admin_menu()">
   <ul class="admin_menu">
       <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
       <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
       <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
       <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
       <li>${h.link_to(_('user groups'),h.url('users_groups'),class_='groups')}</li>
       <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
       <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
       <li>${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}</li>
       <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
   </ul>
 </%def>
 <%def name="admin_menu_simple()">
   <ul>
-      <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
+      <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
   </ul>
 </%def>
 <%def name="repo_context_bar(current=None)">
   <%
       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">
     <div id="context-top">
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         »
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
       </div>
       ## 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.rhodecode_user.username != 'default':
         <ul id="context-actions" class="horizontal-list">
           <li>
            <button class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
             <!--span class="icon show-follow follow"></span>
             <span class="icon show-following following"></span-->
             <span class="show-follow">${_('Follow')}</span>
             <span class="show-following">${_('Unfollow')}</span>
           </button>
           </li>
           <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
           %if h.is_hg(c.rhodecode_repo):
           <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
           %endif
         </ul>
       %endif
     </div>
     <div id="context-state">
       <!--button id="revision-changer">
         <span class="branch-name">graphics/shader-move</span>
         <span class="revision">@73318:8d3d6ee94072</span>
       </button-->
       <ul id="context-pages" class="horizontal-list">
         <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li>
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li>
         <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}" class="files"></span>${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown switch-to"></span>${_('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')}>
           <a href="#" class="dropdown options"></span>Options</a>
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                %if h.HasPermissionAll('hg.admin')('access settings on repository'):
                    <li>${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                %else:
                    <li>${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                %endif
              %endif
               %if c.rhodecode_db_repo.fork:
                <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}</li>
               %endif
               <li>${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li>
               <li>${h.link_to(_('Search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
                 %if c.rhodecode_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
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">Pull Requests
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>
     </div>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var loaded = YUD.hasClass('branch_tag_switcher_2','loaded');

rhodecode/templates/base/root.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>${self.title()}</title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         ## CSS ###
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.rhodecode_version)}"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         <%def name="css_extra()">
         </%def>
         ${self.css()}
         %if c.ga_code:
         <!-- Analytics -->
         <script type="text/javascript">
             var _gaq = _gaq || [];
             _gaq.push(['_setAccount', '${c.ga_code}']);
             _gaq.push(['_trackPageview']);
             (function() {
                 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
                 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
                 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
                 })();
         </script>
         %endif
         ## JAVASCRIPT ##
         <%def name="js()">
             <script type="text/javascript">
             //JS translations map
             var TRANSLATION_MAP = {
                 'Add another comment':'${_("Add another comment")}',
                 'Stop following this repository':"${_('Stop following this repository')}",
                 'Start following this repository':"${_('Start following this repository')}",
                 'Group':"${_('Group')}",
                 'members':"${_('members')}",
                 'Loading ...':"${_('Loading ...')}",
                 'Search truncated': "${_('Search truncated')}",
                 'No matching files': "${_('No matching files')}",
                 'Open new pull request': "${_('Open new pull request')}",
                 'Open new pull request for selected changesets':  "${_('Open new pull request for selected changesets')}",
                 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}",
                 'Show selected change __S': "${_('Show selected change __S')}",
                 'Selection link': "${_('Selection link')}",
                 'Collapse diff': "${_('Collapse diff')}",
                 'Expand diff': "${_('Expand diff')}"
             };
             var _TM = TRANSLATION_MAP;
             var TOGGLE_FOLLOW_URL  = "${h.url('toggle_following')}";

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -65,97 +65,96 @@ ${self.context_bar('changelog')} @@
                         <td class="hash">
                             <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
                                 <span class="changeset_id">${cs.revision}:</span>
                                 <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
                             </a>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="mid">
                             <div class="log-container">
                                 <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
                                 <div class="extra-container">
                                     %if c.comments.get(cs.raw_id,[]):
                                         <div class="comments-container">
                                             <div class="comments-cnt" 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)}">
                                                     ${len(c.comments[cs.raw_id])}
                                                 </a>
                                             </div>
                                         </div>
                                     %endif
                                     %if h.is_hg(c.rhodecode_repo):
                                         %for book in cs.bookmarks:
                                             <div class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
                                                 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                             </div>
                                         %endfor
                                     %endif
                                     %for tag in cs.tags:
                                         <div class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
                                             ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </div>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:
                                         <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
                                             ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>
                                     %endif
                                 </div>
                             </div>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <div class="pagination-wh pagination-left">
                     ${c.pagination.pager('$link_previous ~2~ $link_next')}
                 </div>
             </div>
         </div>
         <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
         <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 //Monitor range checkboxes and build a link to changesets
                 //ranges
                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                 var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
                     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 = url_tmpl.replace('__REVRANGE__',
                                 rev_start+'...'+rev_end);
                         var link = (rev_start == rev_end)
                             ? _TM['Show selected change __S']
                             : _TM['Show selected changes __S -> __E'];
                         link = link.replace('__S',rev_start.substr(0,6));
                         link = link.replace('__E',rev_end.substr(0,6));
@@ @@ -189,78 +188,76 @@ ${self.context_bar('changelog')} @@
                 var msgs = YUQ('.message');
                 // get first element height
                 var el = YUQ('#graph_content .container')[0];
                 var row_h = el.clientHeight;
                 for(var i=0;i<msgs.length;i++){
                     var m = msgs[i];
                     var h = m.clientHeight;
                     var pad = YUD.getStyle(m,'padding');
                     if(h > row_h){
                         var offset = row_h - (h+12);
                         YUD.setStyle(m.nextElementSibling,'display','block');
                         YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
                     };
+                }
                 YUE.on(YUQ('.expand'),'click',function(e){
                     var elem = e.currentTarget.parentNode.parentNode;
                     YUD.setStyle(e.currentTarget,'display','none');
                     YUD.setStyle(elem,'height','auto');
                     //redraw the graph, line_count and jsdata are global vars
                     set_canvas(100);
                     var r = new BranchRenderer();
                     r.render(jsdata,100,line_count);
                 });
                 // change branch filter
                 YUE.on(YUD.get('branch_filter'),'change',function(e){
                     var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                     var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                     var url = url.replace('__BRANCH__',selected_branch);
                     if(selected_branch != ''){
                         window.location = url;
                     }else{
                         window.location = url_main;
+                    }
                 });
                 function set_canvas(width) {
                     var c = document.getElementById('graph_nodes');
                     var t = document.getElementById('graph_content');
                     canvas = document.getElementById('graph_canvas');
                     var div_h = t.clientHeight;
                     //c.style.height=div_h+'px';
                     canvas.setAttribute('height',div_h);
                     //c.style.height=width+'px';
                     canvas.setAttribute('width',width);
                 };
                 var heads = 1;
                 var line_count = 0;
                 var jsdata = ${c.jsdata|n};
                 for (var i=0;i<jsdata.length;i++) {
                     var in_l = jsdata[i][2];
                     for (var j in in_l) {
                         var m = in_l[j][1];
                         if (m > line_count)
                             line_count = m;
+                    }
+                }
                 set_canvas(100);
                 var r = new BranchRenderer();
                 r.render(jsdata,100,line_count);
             });
         </script>
         %else:
             ${_('There are no changes yet')}
         %endif
     </div>
 </div>
 </%def>

0 comments (0 inline, 0 general)