##// END OF EJS Templates
removed upper menu to save space and did little rip off menu similar to G+
marcink -
r1926:049bc911 beta
parent child Browse files
Show More
@@ -258,22 +258,19 b' div.options a {'
258 258 }
259 259
260 260 #header #header-inner {
261 min-height: 40px;
261 min-height: 44px;
262 262 clear: both;
263 263 position: relative;
264 264 background-color: #eedc94;
265 265 background-repeat: repeat-x;
266 background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
267 to(#eedc94) );
266 background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),to(#eedc94) );
268 267 background-image: -moz-linear-gradient(top, #003b76, #00376e);
269 268 background-image: -ms-linear-gradient(top, #003b76, #00376e);
270 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
271 color-stop(100%, #00376e) );
269 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),color-stop(100%, #00376e) );
272 270 background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
273 271 background-image: -o-linear-gradient(top, #003b76, #00376e) );
274 272 background-image: linear-gradient(top, #003b76, #00376e);
275 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
276 endColorstr='#00376e', GradientType=0 );
273 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',endColorstr='#00376e', GradientType=0 );
277 274 margin: 0;
278 275 padding: 0;
279 276 display: block;
@@ -330,7 +327,7 b' div.options a {'
330 327 float: right;
331 328 list-style-type: none;
332 329 list-style-position: outside;
333 margin: 6px 5px 0 0;
330 margin: 8px 5px 0 0;
334 331 padding: 0;
335 332 }
336 333
@@ -341,7 +338,7 b' div.options a {'
341 338 padding: 0;
342 339 }
343 340
344 #header #header-inner #quick li a {
341 #header #header-inner #quick li a.menu_link {
345 342 top: 0;
346 343 left: 0;
347 344 height: 1%;
@@ -424,7 +421,7 b' div.options a {'
424 421 border: 1px solid #666;
425 422 border-top: 1px solid #003367;
426 423 z-index: 100;
427 margin: 0;
424 margin: 2px 0px 0px 0px;
428 425 padding: 0;
429 426 }
430 427
@@ -1886,39 +1883,102 b' div.form div.fields div.field div.button'
1886 1883 padding: 0 0 2px;
1887 1884 }
1888 1885
1886 .user-menu{
1887 margin: 0px !important;
1888 float: left;
1889 }
1890
1891 .user-menu .container{
1892 padding:0px 4px 0px 4px;
1893 margin: 0px 0px 0px 0px;
1894 }
1895
1896 .user-menu .gravatar{
1897 margin: 0px 0px 0px 0px;
1898 cursor: pointer;
1899 }
1900
1889 1901 #quick_login {
1890 top: 31px;
1891 background-color: rgb(0, 51, 103);
1902 min-height: 80px;
1903 margin: 31px 0 0 -251px;
1904 padding: 4px;
1905 position: absolute;
1906 width: 278px;
1907
1908 background-repeat: repeat-x;
1909 background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
1910 to(#eedc94) );
1911 background-image: -moz-linear-gradient(top, #003b76, #00376e);
1912 background-image: -ms-linear-gradient(top, #003b76, #00376e);
1913 background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
1914 color-stop(100%, #00376e) );
1915 background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
1916 background-image: -o-linear-gradient(top, #003b76, #00376e) );
1917 background-image: linear-gradient(top, #003b76, #00376e);
1918 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
1919 endColorstr='#00376e', GradientType=0 );
1920
1892 1921 z-index: 999;
1893 height: 150px;
1894 position: absolute;
1895 margin-left: -16px;
1896 width: 281px;
1897 1922 -webkit-border-radius: 0px 0px 4px 4px;
1898 1923 -khtml-border-radius: 0px 0px 4px 4px;
1899 1924 -moz-border-radius: 0px 0px 4px 4px;
1900 1925 border-radius: 0px 0px 4px 4px;
1901 1926 box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
1902 1927 }
1928 #quick_login h4{
1929 color: #fff;
1930 padding: 5px 0px 5px 14px;
1931 }
1903 1932
1904 1933 #quick_login .password_forgoten {
1905 1934 padding-right: 10px;
1906 1935 padding-top: 0px;
1907 float: left;
1936 text-align: left;
1908 1937 }
1909 1938
1910 1939 #quick_login .password_forgoten a {
1911 font-size: 10px
1940 font-size: 10px;
1941 color: #fff;
1912 1942 }
1913 1943
1914 1944 #quick_login .register {
1915 1945 padding-right: 10px;
1916 1946 padding-top: 5px;
1917 float: left;
1947 text-align: left;
1918 1948 }
1919 1949
1920 1950 #quick_login .register a {
1921 font-size: 10px
1951 font-size: 10px;
1952 color: #fff;
1953 }
1954
1955 #quick_login .submit {
1956 margin: -20px 0 0 194px;
1957 position: absolute;
1958 }
1959
1960 #quick_login .links_left{
1961 float: left;
1962 }
1963 #quick_login .links_right{
1964 float: right;
1965 }
1966 #quick_login .full_name{
1967 color: #FFFFFF;
1968 font-weight: bold;
1969 padding: 3px;
1970 }
1971 #quick_login .big_gravatar{
1972 padding:4px 0px 0px 6px;
1973 }
1974
1975 #quick_login .email,#quick_login .email a{
1976 color: #FFFFFF;
1977 padding: 3px;
1978
1979 }
1980 #quick_login .links .logout{
1981
1922 1982 }
1923 1983
1924 1984 #quick_login div.form div.fields {
@@ -1953,7 +2013,7 b' div.form div.fields div.field div.button'
1953 2013 overflow: hidden;
1954 2014 text-align: right;
1955 2015 margin: 0;
1956 padding: 10px 14px 0px 5px;
2016 padding: 5px 14px 0px 5px;
1957 2017 }
1958 2018
1959 2019 #quick_login div.form div.links {
@@ -1963,6 +2023,30 b' div.form div.fields div.field div.button'
1963 2023 padding: 0 0 2px;
1964 2024 }
1965 2025
2026 #quick_login ol.links{
2027 display: block;
2028 font-weight: bold;
2029 list-style: none outside none;
2030 text-align: right;
2031 }
2032 #quick_login ol.links li{
2033 line-height: 27px;
2034 margin: 0;
2035 padding: 0;
2036 color: #fff;
2037 display: block;
2038 float:none !important;
2039 }
2040
2041 #quick_login ol.links li a{
2042 color: #fff;
2043 display: block;
2044 padding: 2px;
2045 }
2046 #quick_login ol.links li a:HOVER{
2047 background-color: inherit !important;
2048 }
2049
1966 2050 #register div.title {
1967 2051 clear: both;
1968 2052 overflow: hidden;
@@ -3955,20 +4039,24 b' form.comment-inline-form {'
3955 4039 margin:10px 5px !important;
3956 4040 }
3957 4041 .notifications{
3958 width:22px;
3959 padding:2px;
3960 float:right;
4042 border-radius: 4px 4px 4px 4px;
3961 4043 -webkit-border-radius: 4px;
3962 4044 -moz-border-radius: 4px;
3963 border-radius: 4px;
4045 float: right;
4046 margin: 24px 0px 0px;
4047 position: absolute;
3964 4048 text-align: center;
3965 margin: 0px -10px 0px 5px;
3966 background-color: #DEDEDE;
4049 width: 22px;
4050 z-index: 1000;
3967 4051 }
3968 4052 .notifications a{
3969 4053 color:#888 !important;
3970 4054 display: block;
3971 font-size: 10px
4055 font-size: 10px;
4056 background-color: #DEDEDE !important;
4057 border-radius: 2px !important;
4058 -webkit-border-radius: 2px !important;
4059 -moz-border-radius: 2px !important;
3972 4060 }
3973 4061 .notifications a:hover{
3974 4062 text-decoration: none !important;
@@ -3,76 +3,6 b''
3 3
4 4 <!-- HEADER -->
5 5 <div id="header">
6 <!-- user -->
7 <ul id="logged-user">
8 <li class="first">
9 <div id="quick_login" style="display:none">
10 ${h.form(h.url('login_home',came_from=h.url.current()))}
11 <div class="form">
12 <div class="fields">
13 <div class="field">
14 <div class="label">
15 <label for="username">${_('Username')}:</label>
16 </div>
17 <div class="input">
18 ${h.text('username',class_='focus',size=40)}
19 </div>
20
21 </div>
22 <div class="field">
23 <div class="label">
24 <label for="password">${_('Password')}:</label>
25 </div>
26 <div class="input">
27 ${h.password('password',class_='focus',size=40)}
28 </div>
29
30 </div>
31 <div class="buttons">
32 <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
33 <div class="register">
34 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
35 ${h.link_to(_("Don't have an account ?"),h.url('register'))}
36 %endif
37 </div>
38 ${h.submit('sign_in',_('Sign In'),class_="ui-button")}
39 </div>
40 </div>
41 </div>
42 ${h.end_form()}
43 </div>
44
45 <div class="gravatar">
46 <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
47 </div>
48 <div class="account">
49 %if c.rhodecode_user.username == 'default':
50 <a href="${h.url('public_journal')}">${_('Public journal')}</a>
51 %else:
52 <div style="float: left">
53 ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
54 </div>
55 <div class="notifications">
56 <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a>
57 </div>
58 %endif
59 </div>
60 </li>
61 <li>
62 <a href="${h.url('home')}">${_('Home')}</a>
63 </li>
64 %if c.rhodecode_user.username != 'default':
65 <li>
66 <a href="${h.url('journal')}">${_('Journal')}</a>
67 </li>
68 %endif
69 %if c.rhodecode_user.username == 'default':
70 <li class="last highlight">${h.link_to(_(u'Login'),h.url('login_home'),id='quick_login_link')}</li>
71 %else:
72 <li class="last highlight">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
73 %endif
74 </ul>
75 <!-- end user -->
76 6 <div id="header-inner" class="title">
77 7 <div id="logo">
78 8 <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
@@ -130,6 +60,73 b''
130 60 </div>
131 61 </%def>
132 62
63 <%def name="usermenu()">
64 <div class="user-menu">
65 <div class="container">
66 <div class="gravatar" id="quick_login_link">
67 <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
68 </div>
69 %if c.rhodecode_user.username != 'default':
70 <div class="notifications">
71 <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a>
72 </div>
73 %endif
74 </div>
75 <div id="quick_login" style="display:none">
76 %if c.rhodecode_user.username == 'default':
77 <h4>${_('Login to your account')}</h4>
78 ${h.form(h.url('login_home',came_from=h.url.current()))}
79 <div class="form">
80 <div class="fields">
81 <div class="field">
82 <div class="label">
83 <label for="username">${_('Username')}:</label>
84 </div>
85 <div class="input">
86 ${h.text('username',class_='focus',size=40)}
87 </div>
88
89 </div>
90 <div class="field">
91 <div class="label">
92 <label for="password">${_('Password')}:</label>
93 </div>
94 <div class="input">
95 ${h.password('password',class_='focus',size=40)}
96 </div>
97
98 </div>
99 <div class="buttons">
100 <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
101 <div class="register">
102 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
103 ${h.link_to(_("Don't have an account ?"),h.url('register'))}
104 %endif
105 </div>
106 <div class="submit">
107 ${h.submit('sign_in',_('Sign In'),class_="ui-btn xsmall")}
108 </div>
109 </div>
110 </div>
111 </div>
112 ${h.end_form()}
113 %else:
114 <div class="links_left">
115 <div class="full_name">${c.rhodecode_user.full_name}</div>
116 <div class="email">${c.rhodecode_user.email}</div>
117 <div class="big_gravatar"><img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,48)}" /></div>
118 </div>
119 <div class="links_right">
120 <ol class="links">
121 <li>${h.link_to(_(u'Home'),h.url('home'))}</li>
122 <li>${h.link_to(_(u'My account'),h.url('admin_settings_my_account'))}</li>
123 <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
124 </ol>
125 </div>
126 %endif
127 </div>
128 </div>
129 </%def>
133 130
134 131 <%def name="menu(current=None)">
135 132 <%
@@ -142,7 +139,7 b''
142 139 <ul id="quick">
143 140 <!-- repo switcher -->
144 141 <li>
145 <a id="repo_switcher" title="${_('Switch repository')}" href="#">
142 <a class="menu_link" id="repo_switcher" title="${_('Switch repository')}" href="#">
146 143 <span class="icon">
147 144 <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />
148 145 </span>
@@ -156,23 +153,15 b''
156 153 </li>
157 154
158 155 <li ${is_current('summary')}>
159 <a title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
156 <a class="menu_link" title="${_('Summary')}" href="${h.url('summary_home',repo_name=c.repo_name)}">
160 157 <span class="icon">
161 158 <img src="${h.url('/images/icons/clipboard_16.png')}" alt="${_('Summary')}" />
162 159 </span>
163 160 <span>${_('Summary')}</span>
164 161 </a>
165 162 </li>
166 ##<li ${is_current('shortlog')}>
167 ## <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
168 ## <span class="icon">
169 ## <img src="${h.url('/images/icons/application_view_list.png')}" alt="${_('Shortlog')}" />
170 ## </span>
171 ## <span>${_('Shortlog')}</span>
172 ## </a>
173 ##</li>
174 163 <li ${is_current('changelog')}>
175 <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
164 <a class="menu_link" title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
176 165 <span class="icon">
177 166 <img src="${h.url('/images/icons/time.png')}" alt="${_('Changelog')}" />
178 167 </span>
@@ -181,7 +170,7 b''
181 170 </li>
182 171
183 172 <li ${is_current('switch_to')}>
184 <a id="branch_tag_switcher" title="${_('Switch to')}" href="#">
173 <a class="menu_link" id="branch_tag_switcher" title="${_('Switch to')}" href="#">
185 174 <span class="icon">
186 175 <img src="${h.url('/images/icons/arrow_switch.png')}" alt="${_('Switch to')}" />
187 176 </span>
@@ -192,7 +181,7 b''
192 181 </ul>
193 182 </li>
194 183 <li ${is_current('files')}>
195 <a title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
184 <a class="menu_link" title="${_('Files')}" href="${h.url('files_home',repo_name=c.repo_name)}">
196 185 <span class="icon">
197 186 <img src="${h.url('/images/icons/file.png')}" alt="${_('Files')}" />
198 187 </span>
@@ -201,7 +190,7 b''
201 190 </li>
202 191
203 192 <li ${is_current('options')}>
204 <a title="${_('Options')}" href="#">
193 <a class="menu_link" title="${_('Options')}" href="#">
205 194 <span class="icon">
206 195 <img src="${h.url('/images/icons/table_gear.png')}" alt="${_('Admin')}" />
207 196 </span>
@@ -241,7 +230,7 b''
241 230 </li>
242 231
243 232 <li>
244 <a title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
233 <a class="menu_link" title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
245 234 <span class="icon_short">
246 235 <img src="${h.url('/images/icons/heart.png')}" alt="${_('Followers')}" />
247 236 </span>
@@ -249,13 +238,14 b''
249 238 </a>
250 239 </li>
251 240 <li>
252 <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
241 <a class="menu_link" title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
253 242 <span class="icon_short">
254 243 <img src="${h.url('/images/icons/arrow_divide.png')}" alt="${_('Forks')}" />
255 244 </span>
256 245 <span class="short">${c.repository_forks}</span>
257 246 </a>
258 247 </li>
248 ${usermenu()}
259 249 </ul>
260 250 <script type="text/javascript">
261 251 YUE.on('repo_switcher','mouseover',function(){
@@ -294,7 +284,7 b''
294 284 ##ROOT MENU
295 285 <ul id="quick">
296 286 <li>
297 <a title="${_('Home')}" href="${h.url('home')}">
287 <a class="menu_link" title="${_('Home')}" href="${h.url('home')}">
298 288 <span class="icon">
299 289 <img src="${h.url('/images/icons/home_16.png')}" alt="${_('Home')}" />
300 290 </span>
@@ -303,16 +293,25 b''
303 293 </li>
304 294 % if c.rhodecode_user.username != 'default':
305 295 <li>
306 <a title="${_('Journal')}" href="${h.url('journal')}">
296 <a class="menu_link" title="${_('Journal')}" href="${h.url('journal')}">
307 297 <span class="icon">
308 298 <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
309 299 </span>
310 300 <span>${_('Journal')}</span>
311 301 </a>
312 302 </li>
303 %else:
304 <li>
305 <a class="menu_link" title="${_('Public journal')}" href="${h.url('public_journal')}">
306 <span class="icon">
307 <img src="${h.url('/images/icons/book.png')}" alt="${_('Public journal')}" />
308 </span>
309 <span>${_('Public journal')}</span>
310 </a>
311 </li>
313 312 % endif
314 313 <li>
315 <a title="${_('Search')}" href="${h.url('search')}">
314 <a class="menu_link" title="${_('Search')}" href="${h.url('search')}">
316 315 <span class="icon">
317 316 <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
318 317 </span>
@@ -322,7 +321,7 b''
322 321
323 322 %if h.HasPermissionAll('hg.admin')('access admin main page'):
324 323 <li ${is_current('admin')}>
325 <a title="${_('Admin')}" href="${h.url('admin_home')}">
324 <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
326 325 <span class="icon">
327 326 <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
328 327 </span>
@@ -331,6 +330,7 b''
331 330 ${admin_menu()}
332 331 </li>
333 332 %endif
333 ${usermenu()}
334 334 </ul>
335 335 %endif
336 336 </%def>
@@ -117,7 +117,10 b''
117 117 else{
118 118 YUD.setStyle('quick_login','display','');
119 119 YUD.addClass('quick_login_link','enabled');
120 YUD.get('username').focus();
120 var usr = YUD.get('username');
121 if(usr){
122 usr.focus();
123 }
121 124 }
122 125 });
123 126
General Comments 0
You need to be logged in to leave comments. Login now