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

@@ @@ -275,25 +275,28 @@ div.options a { @@
 	display: block;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
+}
 #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");
 	background-position: 0 0;
 	margin: 0;
 	padding: 0;
+}
 #header #header-inner #home a:hover {
@@ @@ -317,25 +320,25 @@ div.options a { @@
 	text-decoration: none;
+}
 #header #header-inner #logo a:hover {
 	color: #bfe3ff;
+}
 #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;
 	margin: 0 5px 0 0;
 	padding: 0;
+}
 #header #header-inner #quick li a.menu_link {
 	top: 0;
@@ @@ -1961,25 +1964,32 @@ div.form div.fields div.field div.button @@
+}
 #quick_login .links_right{
     float: right;
+}
 #quick_login .full_name{
     color: #FFFFFF;
     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{
+}
 #quick_login div.form div.fields {
 	padding-top: 2px;
 	padding-left: 10px;
@@ @@ -3134,25 +3144,25 @@ div.gravatar img { @@
 	-khtml-border-radius: 2px;
 	-moz-border-radius: 2px;
 	border-radius: 2px;
+}
 #header,#content,#footer {
 	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;
+}
 #content div.box div.title div.search div.input input {
 	border: 1px solid #316293;
+}
 .ui-btn{

rhodecode/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -9,29 +9,29 @@ @@
     ${_('My Notifications')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%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
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";

rhodecode/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -11,29 +11,29 @@ @@
     ${_('Show notification')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%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)}"/>
           </div>
           <div class="desc">
               ${c.notification.description}
           </div>
           <div class="delete-notifications">
             <span id="${c.notification.notification_id}" class="delete-notification delete_icon action"></span>

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 -->
         ${self.body()}
     </div>
 </div>
 <!-- END HEADER -->
 <!-- CONTENT -->
@@ @@ -106,24 +106,25 @@ @@
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="ui-btn xsmall")}
                         </div>
                     </div>
                 </div>
             </div>
             ${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>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
         %endif
       </div>
  </div>

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -114,32 +114,22 @@ @@
                      YUD.setStyle('quick_login','display','none');
                      YUD.removeClass('quick_login_link','enabled');
+                 }
                  else{
                      YUD.setStyle('quick_login','display','');
                      YUD.addClass('quick_login_link','enabled');
                      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>
     <body id="body">
         ${next.body()}
     </body>
 </html>

0 comments (0 inline, 0 general)