kallithea Changeset - 91708b96e991

Changeset - 91708b96e991

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2011-07-10 16:26:42
marcin@python-works.com

Fixed show more links.
improved gui for quick menu.

5 files changed with 30 insertions and 13 deletions:

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

rhodecode/templates/admin/admin.html

rhodecode/templates/base/root.html

rhodecode/templates/index_base.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -470,209 +470,223 @@ margin:0 0 0 14px; @@
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.repos,#header #header-inner #quick li ul li a.repos:hover {
 background:url("../images/icons/database_edit.png") no-repeat scroll 4px 9px #FFF;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.repos_groups,#header #header-inner #quick li ul li a.repos_groups:hover {
 background:url("../images/icons/database_link.png") no-repeat scroll 4px 9px #FFF;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.users,#header #header-inner #quick li ul li a.users:hover {
 background:#FFF url("../images/icons/user_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.groups,#header #header-inner #quick li ul li a.groups:hover {
 background:#FFF url("../images/icons/group_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.settings,#header #header-inner #quick li ul li a.settings:hover {
 background:#FFF url("../images/icons/cog.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.permissions,#header #header-inner #quick li ul li a.permissions:hover {
 background:#FFF url("../images/icons/key.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.ldap,#header #header-inner #quick li ul li a.ldap:hover {
 background:#FFF url("../images/icons/server_key.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.fork,#header #header-inner #quick li ul li a.fork:hover {
 background:#FFF url("../images/icons/arrow_divide.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.search,#header #header-inner #quick li ul li a.search:hover {
 background:#FFF url("../images/icons/search_16.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.delete,#header #header-inner #quick li ul li a.delete:hover {
 background:#FFF url("../images/icons/delete.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.branches,#header #header-inner #quick li ul li a.branches:hover {
 background:#FFF url("../images/icons/arrow_branch.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.tags,#header #header-inner #quick li ul li a.tags:hover {
 background:#FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.admin,#header #header-inner #quick li ul li a.admin:hover {
 background:#FFF url("../images/icons/cog_edit.png") no-repeat 4px 9px;
 width:167px;
 margin:0;
 padding:12px 9px 7px 24px;
+}
 .quick_repo_menu{
-	background: #FFF url("../images/vertical-indicator.png") 6px 9px no-repeat !important;
+	background: #FFF url("../images/vertical-indicator.png") 8px 50% no-repeat !important;
 	cursor: pointer;
 	width: 8px;
+}
 .quick_repo_menu.active{
-    background: #FFF url("../images/horizontal-indicator.png") 4px 9px no-repeat !important;
+    background: #FFF url("../images/horizontal-indicator.png") 4px 50% no-repeat !important;
     cursor: pointer;
+}
 .quick_repo_menu .menu_items{
 	margin-top:6px;
 	width:150px;
 	position: absolute;
 	background-color:#FFF;
 	padding: 4px;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #003367 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid;
     border-width: 1px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
 .quick_repo_menu .menu_items li{
     padding:0 !important;
+}
 .quick_repo_menu .menu_items a{
 	display: block;
 	padding: 4px 12px 4px 8px;
+}
 .quick_repo_menu .menu_items a:hover{
     background-color: #EEE;
     text-decoration: none;
+}
 .quick_repo_menu .menu_items .icon img{
 	margin-bottom:-2px;
+}
 .quick_repo_menu .menu_items.hidden{
 	display: none;
+}
 #content #left {
 left:0;
 width:280px;
 position:absolute;
+}
 #content #right {
 margin:0 60px 10px 290px;
+}
 #content div.box {
 clear:both;
 overflow:hidden;
 background:#fff;
 margin:0 0 10px;
 padding:0 0 10px;
+}
 #content div.box-left {
 width:49%;
 clear:none;
 float:left;
 margin:0 0 10px;
+}
 #content div.box-right {
 width:49%;
 clear:none;
 float:right;
 margin:0 0 10px;
+}
 #content div.box div.title {
 clear:both;
 overflow:hidden;
 background:#369 url("../images/header_inner.png") repeat-x;
 margin:0 0 20px;
 padding:0;
+}
 #content div.box div.title h5 {
 float:left;
 border:none;
 color:#fff;
 text-transform:uppercase;
 margin:0;
 padding:11px 0 11px 10px;
+}
 #content div.box div.title ul.links li {
 list-style:none;
 float:left;
 margin:0;
 padding:0;
+}
 #content div.box div.title ul.links li a {
     border-left: 1px solid #316293;
     color: #FFFFFF;
     display: block;
     float: left;
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 0;
     padding: 11px 22px 12px;
     text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6 {
 clear:both;
 overflow:hidden;
 border-bottom:1px solid #DDD;
 margin:10px 20px;
 padding:0 0 15px;
+}
 #content div.box p {
 color:#5f5f5f;
 font-size:12px;
 line-height:150%;
 margin:0 24px 10px;
 padding:0;
+}
 #content div.box blockquote {
 border-left:4px solid #DDD;
 color:#5f5f5f;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -43,96 +43,108 @@ String.prototype.format = function() { @@
 	  return format;
 	}();
 /**
  * GLOBAL YUI Shortcuts
  */
 var YUC = YAHOO.util.Connect;
 var YUD = YAHOO.util.Dom;
 var YUE = YAHOO.util.Event;
 var YUQ = YAHOO.util.Selector.query;
 // defines if push state is enabled for this browser ?
 var push_state_enabled = Boolean(
 		window.history && window.history.pushState && window.history.replaceState
 		&& !(   /* disable for versions of iOS before version 4.3 (8F190) */
 				(/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent)
 				/* disable for the mercury iOS browser, or at least older versions of the webkit engine */
 				|| (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent)
+		)
+)
 /**
  * Partial Ajax Implementation
+ *
  * @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 f_call: failure callback
  * @param args arguments
  */
 function ypjax(url,container,s_call,f_call,args){
 	var method='GET';
 	if(args===undefined){
 		args=null;
+	}
 	// 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){
 			YUD.get(container).innerHTML=o.responseText;
 			YUD.setStyle(container,'opacity','1.0');
     		//execute the given original callback
     		if (s_call !== undefined){
     			s_call(o);
+    		}
+		}
 	})()
 	YUD.setStyle(container,'opacity','0.3');
 	YUC.asyncRequest(method,url,{
 		success:s_wrapper,
 		failure:function(o){
 			//failure
 			window.location = url;
+		}
 	},args);
+}
 /**
  * tooltip activate
  */
 function tooltip_activate(){
     function toolTipsId(){
         var ids = [];
         var tts = YUQ('.tooltip');
         for (var i = 0; i < tts.length; i++) {
             // if element doesn't not have and id
         	//  autogenerate one for tooltip
             if (!tts[i].id){
                 tts[i].id='tt'+((i*100)+tts.length);
+            }
             ids.push(tts[i].id);
+        }
         return ids
     };
     var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
         context: [[toolTipsId()],"tl","bl",null,[0,5]],
         monitorresize:false,
         xyoffset :[0,0],
         autodismissdelay:300000,
         hidedelay:5,
         showdelay:20,
     });
+}
 /**
  * show more
  */
 function show_more_event(){
     YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
         var el = e.target;
         YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
         YUD.setStyle(el.parentNode,'display','none');
     });
+}

rhodecode/templates/admin/admin.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Admin journal')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Admin journal')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
 	<!-- box / title -->
 	<div class="title">
 	    ${self.breadcrumbs()}
 	</div>
 	<!-- end box / title -->
 	<div class="table">
         <script type="text/javascript">
         function show_more_event(){
 	        YUE.on(YUD.getElementsByClassName('show_more'),'click',function(e){
 	            var el = e.target;
 	            YUD.setStyle(YUD.get(el.id.substring(1)),'display','');
 	            YUD.setStyle(el.parentNode,'display','none');
 	        });
+        }
         </script>
 	    <div id="user_log">
 	        ${c.log_data}
 	    </div>
 	</div>
 </div>
 </%def>
@@ \ No newline at end of file @@

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -24,120 +24,121 @@ @@
         <!-- 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" src="${h.url('/js/yui.2.9.js')}"></script>
             <!--[if IE]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
             <![endif]-->
             <script type="text/javascript" src="${h.url('/js/yui.flot.js')}"></script>
             <script type="text/javascript" src="${h.url('/js/rhodecode.js')}"></script>
            ## EXTRA FOR JS
            ${self.js_extra()}
             <script type="text/javascript">
             var base_url  = "${h.url('toggle_following')}";
             function onSuccess(target){
                 var f = YUD.get(target.id);
                 var f_cnt = YUD.get('current_followers_count');
                 if(f.getAttribute('class')=='follow'){
                     f.setAttribute('class','following');
                     f.setAttribute('title',"${_('Stop following this repository')}");
                     if(f_cnt){
                         var cnt = Number(f_cnt.innerHTML)+1;
                         f_cnt.innerHTML = cnt;
+                    }
+                }
                 else{
                     f.setAttribute('class','follow');
                     f.setAttribute('title',"${_('Start following this repository')}");
                     if(f_cnt){
                         var cnt = Number(f_cnt.innerHTML)+1;
                         f_cnt.innerHTML = cnt;
+                    }
+                }
+            }
             function toggleFollowingUser(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',base_url,{
                     success:function(o){
                         onSuccess(target);
+                    }
                 },args);
                 return false;
+            }
             function toggleFollowingRepo(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',base_url,{
                     success:function(o){
                         onSuccess(target);
+                    }
                 },args);
                 return false;
+            }
            YUE.onDOMReady(function(){
              YUE.on('quick_login_link','click',function(e){
                  if(YUD.hasClass('quick_login_link','enabled')){
                      YUD.setStyle('quick_login','display','none');
                      YUD.removeClass('quick_login_link','enabled');
+                 }
                  else{
                      YUD.setStyle('quick_login','display','');
                      YUD.addClass('quick_login_link','enabled');
                      YUD.get('username').focus();
+                 }
                  //make sure we don't redirect
                  YUE.preventDefault(e);
              });
             tooltip_activate();
             show_more_event();
             YUE.on(YUQ('.quick_repo_menu'),'click',function(e){
             	var menu = e.currentTarget.firstElementChild;
             	if(YUD.hasClass(menu,'hidden')){
             		YUD.addClass(e.currentTarget,'active');
             		YUD.removeClass(menu,'hidden');
             	}else{
             		YUD.removeClass(e.currentTarget,'active');
             		YUD.addClass(menu,'hidden');
+            	}
             })
            })
             </script>
         </%def>
         <%def name="js_extra()">
         </%def>
         ${self.js()}
     </head>
     <body id="body">
         ${next.body()}
     </body>
 </html>
@@ \ No newline at end of file @@

rhodecode/templates/index_base.html

➞

Show inline comments

 <%page args="parent" />
     <%def name="get_sort(name)">
         <%name_slug = name.lower().replace(' ','_') %>
         %if name_slug == c.sort_slug:
           %if c.sort_by.startswith('-'):
             <a href="?sort=${name_slug}">${name}&uarr;</a>
           %else:
             <a href="?sort=-${name_slug}">${name}&darr;</a>
           %endif:
         %else:
             <a href="?sort=${name_slug}">${name}</a>
         %endif
     </%def>
     <div class="box">
         <!-- box / title -->
         <div class="title">
             <h5><input class="top-right-rounded-corner top-left-rounded-corner
                                bottom-left-rounded-corner bottom-right-rounded-corner"
                         id="q_filter" size="15" type="text" name="filter"
                         value="${_('quick filter...')}"/>
             ${parent.breadcrumbs()} <span id="repo_count"></span> ${_('repositories')}
             </h5>
             %if c.rhodecode_user.username != 'default':
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
                 <ul class="links">
                   <li>
                     <span>${h.link_to(_('ADD NEW REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
                   </li>
                 </ul>
                 %endif
             %endif
         </div>
         <!-- end box / title -->
         <div class="table">
            % if c.groups:
             <table>
                 <thead>
                     <tr>
                         <th class="left"><a href="#">${_('Group name')}</a></th>
                         <th class="left"><a href="#">${_('Description')}</a></th>
                         <th class="left"><a href="#">${_('Number of repositories')}</a></th>
                     </tr>
                 </thead>
                 ## REPO GROUPS
                 % for gr in c.groups:
                   <tr>
                       <td>
                           <div style="white-space: nowrap">
                           <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/>
                           ${h.link_to(gr.group_name,url('repos_group',id=gr.group_id))}
                           </div>
                       </td>
                       <td>${gr.group_description}</td>
                       <td><b>${gr.repositories.count()}</b></td>
                   </tr>
                 % endfor
             </table>
             <div style="height: 20px"></div>
             % endif
             <table>
             <thead>
                 <tr>
                     <th class="left"></th>
                     <th class="left">${get_sort(_('Name'))}</th>
                     <th class="left">${get_sort(_('Description'))}</th>
                     <th class="left">${get_sort(_('Last change'))}</th>
                     <th class="left">${get_sort(_('Tip'))}</th>
                     <th class="left">${get_sort(_('Owner'))}</th>
                     <th class="left">${_('RSS')}</th>
                     <th class="left">${_('Atom')}</th>
                 </tr>
             </thead>
             <tbody>
             %for cnt,repo in enumerate(c.repos_list):
                 <tr class="parity${cnt%2}">
                     <td class="quick_repo_menu">
                     <ul class="menu_items hidden">
                       <li>
                          <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
                          </span>
                          <span>${_('Summary')}</span>
                          </a>
                       </li>
                       <li>
                          <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
                          </span>
                          <span>${_('Changelog')}</span>
                          </a>
                       </li>
                       <li>
                          <a title="${_('Files')}" href="${h.url('files_home',repo_name=repo['name'])}">
                          <span class="icon">
                              <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
                          </span>
                          <span>${_('Files')}</span>
                          </a>
                       </li>
                     </ul>
                     </td>
                     <td>
                     ## TYPE OF REPO
                     <div style="white-space: nowrap">
                      %if repo['dbrepo']['repo_type'] =='hg':
                        <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
                      %elif repo['dbrepo']['repo_type'] =='git':
                        <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
                      %endif
                      ##PRIVATE/PUBLIC
                      %if repo['dbrepo']['private']:
                         <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
                      %else:
                         <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
                      %endif
                     ##NAME
                     ${h.link_to(repo['name'],
                         h.url('summary_home',repo_name=repo['name']),class_="repo_name")}
                     %if repo['dbrepo_fork']:
                         <a href="${h.url('summary_home',repo_name=repo['dbrepo_fork']['repo_name'])}">
                         <img class="icon" alt="${_('fork')}"
                         title="${_('Fork of')} ${repo['dbrepo_fork']['repo_name']}"
                         src="${h.url('/images/icons/arrow_divide.png')}"/></a>
                     %endif
                     </div>

0 comments (0 inline, 0 general)