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

@@ @@ -542,65 +542,79 @@ 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;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -115,24 +115,36 @@ function ypjax(url,container,s_call,f_ca @@
  */
 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

@@ @@ -96,48 +96,49 @@ @@
                     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

@@ @@ -15,49 +15,48 @@ @@
     <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>

0 comments (0 inline, 0 general)