kallithea Changeset - 93d4e3eb7d84

Changeset - 93d4e3eb7d84

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2012-02-19 18:36:42
marcin@python-works.com

made upper menu always hover, looks nicer and produces less troubles
- added notification inbox into quick menu
- commented yet innactive compose message button

5 files changed with 26 insertions and 25 deletions:

rhodecode/public/css/style.css

rhodecode/templates/admin/notifications/notifications.html

rhodecode/templates/admin/notifications/show_notification.html

rhodecode/templates/base/base.html

rhodecode/templates/base/root.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -281,13 +281,16 @@ div.options a { @@
+}
 #header #header-inner.hover{
 	position: fixed !important;
 	width: 100% !important;
 	margin-left: -10px !important;
 	z-index: 10000;
 	border-radius: 0px 0px 4px 4px;
     -webkit-border-radius: 0px 0px 0px 0px;
     -khtml-border-radius: 0px 0px 0px 0px;
     -moz-border-radius: 0px 0px 0px 0px;
     border-radius: 0px 0px 0px 0px;
+}
 #header #header-inner #home a {
 	height: 40px;
 	width: 46px;
 	display: block;
 	background: url("../images/button_home.png");
@@ @@ -323,13 +326,13 @@ div.options a { @@
 #header #header-inner #quick,#header #header-inner #quick ul {
 	position: relative;
 	float: right;
 	list-style-type: none;
 	list-style-position: outside;
-	margin: 8px 5px 0 0;
+	margin: 8px 8px 0 0;
 	padding: 0;
+}
 #header #header-inner #quick li {
 	position: relative;
 	float: left;
@@ @@ -1967,13 +1970,20 @@ div.form div.fields div.field div.button @@
     font-weight: bold;
     padding: 3px;
+}
 #quick_login .big_gravatar{
 	padding:4px 0px 0px 6px;
+}
 #quick_login .inbox{
     padding:4px 0px 0px 6px;
     color: #FFFFFF;
     font-weight: bold;
+}
 #quick_login .inbox a{
 	color: #FFFFFF;
+}
 #quick_login .email,#quick_login .email a{
     color: #FFFFFF;
     padding: 3px;
+}
 #quick_login .links .logout{
@@ @@ -3140,13 +3150,13 @@ div.gravatar img { @@
 	min-width: 978px;
+}
 #content {
 	clear: both;
 	overflow: hidden;
 	padding: 14px 10px;
+	padding: 54px 10px 14px 10px;
+}
 #content div.box div.title div.search {
 	border-left: 1px solid #316293;
+}

rhodecode/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -15,17 +15,17 @@ @@
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>
         </ul>
         ##<ul class="links">
         ##    <li>
         ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
         ##    </li>
         ##</ul>
     </div>
     %if c.notifications:
       <div style="padding:10px 15px;text-align: right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
       </div>
     %endif

rhodecode/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -17,17 +17,17 @@ @@
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>
         </ul>
         ##<ul class="links">
         ##    <li>
         ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
         ##    </li>
         ##</ul>
     </div>
     <div class="table">
       <div id="notification_${c.notification.notification_id}">
         <div class="notification-header">
           <div class="gravatar">
               <img alt="gravatar" src="${h.gravatar_url(h.email(c.notification.created_by_user.email),24)}"/>

rhodecode/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 <!-- HEADER -->
 <div id="header">
     <div id="header-inner" class="title">
+    <div id="header-inner" class="title hover">
         <div id="logo">
             <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
@@ @@ -112,12 +112,13 @@ @@
             ${h.end_form()}
         %else:
             <div class="links_left">
                 <div class="full_name">${c.rhodecode_user.full_name_or_username}</div>
                 <div class="email">${c.rhodecode_user.email}</div>
                 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
                 <div class="inbox"><a href="${h.url('notifications')}">${_('Inbox')}: ${c.unread_notifications}</a></div>
             </div>
             <div class="links_right">
             <ol class="links">
               <li>${h.link_to(_(u'Home'),h.url('home'))}</li>
               <li>${h.link_to(_(u'Journal'),h.url('journal'))}</li>
               <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -120,22 +120,12 @@ @@
                      var usr = YUD.get('username');
                      if(usr){
                     	 usr.focus();
+                     }
+                 }
              });
             // hover menu
             YUE.on(window,'scroll',function(){
                 if(YUD.getDocumentScrollTop() > 45){
                       YUD.addClass('header-inner','hover');
+                }
                 else{
                     YUD.removeClass('header-inner','hover');
+                }
             })
            })
             </script>
         </%def>
         <%def name="js_extra()"></%def>
         ${self.js()}
     </head>

0 comments (0 inline, 0 general)