Commit e47882fd2919f1971479bc9c31436f5bf7085240
1 parent
fb2196ad
Exists in
master
and in
28 other branches
ActionItem413: more code adaptetion for a better user experience
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2056 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
20 changed files
with
200 additions
and
171 deletions
Show diff stats
app/views/account/login.rhtml
| ... | ... | @@ -11,10 +11,12 @@ |
| 11 | 11 | :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %> |
| 12 | 12 | |
| 13 | 13 | <%= f.text_field :login, |
| 14 | + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login', | |
| 14 | 15 | :help => _('Here goes the nickname that you give on the registration.'), |
| 15 | 16 | :onchange => 'this.value = convToValidLogin( this.value )' %> |
| 16 | 17 | |
| 17 | 18 | <%= f.password_field :password, |
| 19 | + :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password', | |
| 18 | 20 | :help => _('your password is personal, protect it.') %> |
| 19 | 21 | |
| 20 | 22 | <% button_bar do %> |
| ... | ... | @@ -36,7 +38,7 @@ |
| 36 | 38 | |
| 37 | 39 | <% if lightbox? %> |
| 38 | 40 | <script type='text/javascript'> |
| 39 | - $('login').focus(); | |
| 41 | + $("lightbox_user_login").focus(); | |
| 40 | 42 | </script> |
| 41 | 43 | <% end %> |
| 42 | 44 | ... | ... |
app/views/layouts/application.rhtml
| ... | ... | @@ -93,6 +93,10 @@ |
| 93 | 93 | </div> |
| 94 | 94 | |
| 95 | 95 | <div id="navigation_bar"> |
| 96 | + <%= link_to "<span>"+ @environment.name() +"</span>", | |
| 97 | + { :controller=>"home" }, | |
| 98 | + :id=>"menu_link_to_envhome", | |
| 99 | + :title=>@environment.name %> | |
| 96 | 100 | <%= render :file => 'shared/categories_menu' %> |
| 97 | 101 | </div><!-- id='navigation_bar' --> |
| 98 | 102 | <script type="text/javascript"> |
| ... | ... | @@ -105,7 +109,6 @@ |
| 105 | 109 | |
| 106 | 110 | <div id="user_box"> |
| 107 | 111 | <%= render :file => 'shared/user_menu' %> |
| 108 | - <%= theme_opt_menu_search %> | |
| 109 | 112 | </div><!-- id='user_box' --> |
| 110 | 113 | |
| 111 | 114 | <a href="#" id="btShowHelp" class="icon-help32on help-on" | ... | ... |
app/views/search/_display_results.rhtml
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | <% if @results.size != 1 %> |
| 16 | 16 | <h3> |
| 17 | 17 | <%= @names[name] %> |
| 18 | - <%= link_to _('(more ...)'), params.merge(:action => 'index', :find_in => [ name ]) %> | |
| 18 | + <%= icon_button :more, _('more...'), params.merge(:action => 'index', :find_in => [ name ]) %> | |
| 19 | 19 | </h3> |
| 20 | 20 | <% end %> |
| 21 | 21 | <% end %> | ... | ... |
app/views/shared/categories_menu.rhtml
| 1 | 1 | <ul id="cat_menu"> |
| 2 | - <%= link_to( "<span>"+ @environment.name() +"</span>", {:controller=>"home"}, :id=>"menu_link_to_envhome", :title=>@environment.name) %> | |
| 3 | 2 | <% @environment.display_categories.each do |item| %> |
| 4 | 3 | <li id="category<%= item.display_color %>"<%= ' class="active"' if (@category && (@category.top_ancestor == item)) %>> |
| 5 | 4 | <%= item.name %> |
| ... | ... | @@ -17,6 +16,7 @@ |
| 17 | 16 | </ul><!-- fim id="cat_menu" --> |
| 18 | 17 | |
| 19 | 18 | <div id="assets_menu"> |
| 19 | + <%= theme_opt_menu_search %> | |
| 20 | 20 | <div id="assets_menu_list" class="top_extra_menu"> |
| 21 | 21 | <ul id="assets_menu_ul"> |
| 22 | 22 | <%= generate_assets_menu %> | ... | ... |
public/designs/icons/default/style.css
| ... | ... | @@ -14,6 +14,7 @@ |
| 14 | 14 | .icon-back { background-image: url(go-back-HC.gif) } |
| 15 | 15 | .icon-next { background-image: url(gtk-media-next-ltr.png) } |
| 16 | 16 | .icon-add { background-image: url(add-HC.gif) } |
| 17 | +.icon-more { background-image: url(add-HC.gif) } | |
| 17 | 18 | .icon-up { background-image: url(go-up-HC.gif) } |
| 18 | 19 | .icon-up-red { background-image: url(go-up-red-HC.gif) } |
| 19 | 20 | .icon-down { background-image: url(go-down-HC.gif) } | ... | ... |
public/designs/templates/default/stylesheets/style.css
public/designs/themes/ecosol/stylesheets/common.css
| ... | ... | @@ -33,6 +33,10 @@ body.category2 #wrap { background-image: url("../images/bg-top-verde.png"); } |
| 33 | 33 | body.category3 #wrap { background-image: url("../images/bg-top-lilas.png"); } |
| 34 | 34 | body.category4 #wrap { background-image: url("../images/bg-top-vermelho.png"); } |
| 35 | 35 | |
| 36 | +.box-3 { | |
| 37 | + padding-top: 35px; | |
| 38 | +} | |
| 39 | + | |
| 36 | 40 | #path_category { |
| 37 | 41 | position: absolute; |
| 38 | 42 | top: 40px; | ... | ... |
public/designs/themes/ecosol/stylesheets/menu.css
| 1 | +#navigation_bar { | |
| 2 | + top: 3px; | |
| 3 | + left: 3px; | |
| 4 | + right: 3px; | |
| 5 | +} | |
| 1 | 6 | |
| 2 | 7 | #menu_link_to_envhome { |
| 3 | 8 | display: block; |
| ... | ... | @@ -13,11 +18,6 @@ body.category2 #menu_link_to_envhome { background-image: url(../images/ico-fbes- |
| 13 | 18 | body.category3 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-lilas.gif) } |
| 14 | 19 | body.category4 #menu_link_to_envhome { background-image: url(../images/ico-fbes-fundo-vermelho.gif) } |
| 15 | 20 | |
| 16 | -#noosfero_bar { | |
| 17 | - left: 3px; | |
| 18 | - right: 3px; | |
| 19 | -} | |
| 20 | - | |
| 21 | 21 | body.category1 #noosfero_bar { background-color: #E26B00 } |
| 22 | 22 | #category1 .linkSubMenu, |
| 23 | 23 | #category1 ul { background-color: #F57900 } |
| ... | ... | @@ -62,9 +62,6 @@ body.category4 .linkSubMenu { background-image: url(../images/borda-esq-aba-verm |
| 62 | 62 | #assets_menu { |
| 63 | 63 | overflow: hidden; /* MSIE workarround bug */ |
| 64 | 64 | } |
| 65 | -#assets_menu ul { | |
| 66 | - height: 55px; | |
| 67 | -} | |
| 68 | 65 | |
| 69 | 66 | body.category1 #assets_menu_layout_iten { background: url(../images/top-bar/assets-menu-top-laranja.gif) } |
| 70 | 67 | body.category2 #assets_menu_layout_iten { background: url(../images/top-bar/assets-menu-top-verde.gif) } | ... | ... |
public/designs/themes/zen3/stylesheets/blocks/profile-list-block.css
| 1 | 1 | |
| 2 | 2 | .common-profile-list-block li a { |
| 3 | - border: 2px solid #FFF; | |
| 3 | + border: 2px solid transparent; | |
| 4 | 4 | color: #C00; |
| 5 | 5 | -moz-border-radius: 4px; |
| 6 | 6 | } |
| 7 | +.msie6 .common-profile-list-block li a { | |
| 8 | + border: 2px solid #FFF; | |
| 9 | +} | |
| 7 | 10 | |
| 8 | 11 | .common-profile-list-block li a:hover { |
| 9 | 12 | border: 2px solid #C00; | ... | ... |
public/designs/themes/zen3/stylesheets/common.css
| 1 | 1 | |
| 2 | 2 | body { |
| 3 | - background: #9ca09a; #A1A59F; /* #BABDB6; #888A85; */ | |
| 3 | + background: #9CA09A; | |
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | #wrap { |
| ... | ... | @@ -19,6 +19,10 @@ body { |
| 19 | 19 | |
| 20 | 20 | /* * * Content * * * * * * * * * * * * * * * * * * * */ |
| 21 | 21 | |
| 22 | +#content { | |
| 23 | + padding: 0px 0px 15px 0px; | |
| 24 | +} | |
| 25 | + | |
| 22 | 26 | #content h1, #content h2, #content h3, |
| 23 | 27 | #content h4, #content h5, #content h6 { |
| 24 | 28 | margin: 10px 0px; | ... | ... |
public/designs/themes/zen3/stylesheets/controller_search.css
public/designs/themes/zen3/stylesheets/menu.css
| 1 | 1 | |
| 2 | 2 | #noosfero_bar { |
| 3 | 3 | height: 34px; |
| 4 | - z-index: 100; | |
| 5 | 4 | font-size: 12px; |
| 6 | - letter-spacing: -1px; | |
| 7 | 5 | background: #F57900 url(../images/menu-bg.png) 0% 100% repeat-x; |
| 8 | 6 | } |
| 9 | 7 | |
| ... | ... | @@ -23,11 +21,98 @@ |
| 23 | 21 | } |
| 24 | 22 | |
| 25 | 23 | |
| 24 | +/* * * Assets Menu * * * * * * * * * * * */ | |
| 25 | + | |
| 26 | +#assets_menu { | |
| 27 | + width: 180px; | |
| 28 | + position: absolute; | |
| 29 | + top: 7px; | |
| 30 | + right: 160px; | |
| 31 | + padding: 0px; | |
| 32 | +} | |
| 33 | +.msie6 #assets_menu { | |
| 34 | + margin-right: 160px; | |
| 35 | +} | |
| 36 | + | |
| 37 | +#assets_menu_layout_iten { | |
| 38 | + display: none; | |
| 39 | +} | |
| 40 | + | |
| 41 | +#assets_menu_list { | |
| 42 | + padding: 0px; | |
| 43 | + background: transparent; | |
| 44 | +} | |
| 45 | + | |
| 46 | +#assets_menu ul { | |
| 47 | + height: auto; | |
| 48 | + max-width: none; | |
| 49 | + width: auto; | |
| 50 | + overflow: visible; | |
| 51 | +} | |
| 52 | +#assets_menu li { | |
| 53 | + margin: 0px; | |
| 54 | + padding: 0px 4px; | |
| 55 | + float: left; | |
| 56 | + width: 22px; | |
| 57 | + height: 20px; | |
| 58 | + position: relative; | |
| 59 | +} | |
| 60 | + | |
| 61 | +#assets_menu a { | |
| 62 | + letter-spacing: 0px; | |
| 63 | + color: #FFF; | |
| 64 | + position: absolute; | |
| 65 | + left: 0px; | |
| 66 | + top: 0px; | |
| 67 | + overflow: visible; | |
| 68 | + opacity: 0.6; | |
| 69 | + filter: alpha(opacity=60); | |
| 70 | +} | |
| 71 | +.msie #assets_menu a { | |
| 72 | + width: 100px; | |
| 73 | + height: 20px; | |
| 74 | + margin-left: 0px; | |
| 75 | + cursor: pointer; | |
| 76 | +} | |
| 77 | +#assets_menu a:hover { | |
| 78 | + background: transparent; | |
| 79 | + opacity: 1; | |
| 80 | + filter: alpha(opacity=100); | |
| 81 | +} | |
| 82 | +.msie #assets_menu a:hover { | |
| 83 | + height: 44px; | |
| 84 | +} | |
| 85 | + | |
| 86 | +#assets_menu a strong { | |
| 87 | + position: absolute; | |
| 88 | + top: 22px; | |
| 89 | + left: -10px; | |
| 90 | + background: #F57900; | |
| 91 | + border: 1px solid #A40000; | |
| 92 | + padding: 1px 5px; | |
| 93 | + display: none; | |
| 94 | +} | |
| 95 | +.msie #assets_menu a strong { | |
| 96 | + left: 0px; | |
| 97 | +} | |
| 98 | + | |
| 99 | +.msie #assets_menu a span { | |
| 100 | + left: 10px; | |
| 101 | +} | |
| 102 | + | |
| 103 | +#assets_menu a:hover strong { | |
| 104 | + display: block; | |
| 105 | + -moz-border-radius: 4px; | |
| 106 | +} | |
| 107 | + | |
| 26 | 108 | /* * * Menu Search Box * * * * * * * * * * * */ |
| 27 | 109 | |
| 28 | 110 | #simple-search { |
| 111 | + position: absolute; | |
| 112 | + top: -1px; | |
| 113 | + left: 190px; | |
| 29 | 114 | margin: 0px; |
| 30 | - padding: 5px 0px 0px 0px; | |
| 115 | + padding: 0px; | |
| 31 | 116 | } |
| 32 | 117 | |
| 33 | 118 | #simple-search input { |
| ... | ... | @@ -35,6 +120,8 @@ |
| 35 | 120 | padding-top: 2px; |
| 36 | 121 | height: 16px; |
| 37 | 122 | border: 1px solid #A40000; |
| 123 | + border-right: 1px solid #900; | |
| 124 | + border-bottom: 1px solid #800; | |
| 38 | 125 | background: #F57900 url(../images/search.gif) 1px 90% no-repeat; |
| 39 | 126 | color: #000; |
| 40 | 127 | text-align: center; |
| ... | ... | @@ -61,8 +148,9 @@ |
| 61 | 148 | /* * * User Menu * * * * * * * * * * * */ |
| 62 | 149 | |
| 63 | 150 | #user_menu { |
| 64 | - top: 4px; | |
| 65 | - right: 350px; | |
| 151 | + position: absolute; | |
| 152 | + top: 0px; | |
| 153 | + left: -180px; | |
| 66 | 154 | width: 150px; |
| 67 | 155 | overflow: hidden; |
| 68 | 156 | padding: 2px 0px; |
| ... | ... | @@ -86,19 +174,17 @@ |
| 86 | 174 | } |
| 87 | 175 | |
| 88 | 176 | #user_menu_head img { |
| 89 | - margin-left: -20px; | |
| 177 | + margin-left: 0px; | |
| 90 | 178 | } |
| 91 | -.msie #user_menu_head img { | |
| 92 | - margin-left: 5px; | |
| 179 | +.msie6 #user_menu_head img { | |
| 180 | + margin-left: 4px; | |
| 93 | 181 | } |
| 94 | 182 | |
| 95 | 183 | #user_menu_head span { |
| 96 | 184 | color: #FFF; |
| 97 | 185 | opacity: 0.6; |
| 98 | 186 | filter: alpha(opacity=60); |
| 99 | -} | |
| 100 | -.msie #user_menu_head span { | |
| 101 | - margin-left: 24px; | |
| 187 | + margin-left: 16px; | |
| 102 | 188 | } |
| 103 | 189 | |
| 104 | 190 | #user_menu a { |
| ... | ... | @@ -143,92 +229,6 @@ |
| 143 | 229 | display: none; /* do not show this link in the fist page */ |
| 144 | 230 | } |
| 145 | 231 | |
| 146 | -/* * * Assets Menu * * * * * * * * * * * */ | |
| 147 | - | |
| 148 | -#assets_menu { | |
| 149 | - position: absolute; | |
| 150 | - top: 7px; | |
| 151 | - right: 160px; | |
| 152 | - padding: 0px; | |
| 153 | -} | |
| 154 | -.msie6 #assets_menu { | |
| 155 | - margin-right: 170px; | |
| 156 | -} | |
| 157 | -.msie7 #assets_menu { | |
| 158 | - margin-right: 10px; | |
| 159 | -} | |
| 160 | - | |
| 161 | -#assets_menu_layout_iten { | |
| 162 | - display: none; | |
| 163 | -} | |
| 164 | - | |
| 165 | -#assets_menu_list { | |
| 166 | - padding: 0px; | |
| 167 | - background: transparent; | |
| 168 | -} | |
| 169 | - | |
| 170 | -#assets_menu ul { | |
| 171 | - height: auto; | |
| 172 | - max-width: none; | |
| 173 | - width: auto; | |
| 174 | - overflow: visible; | |
| 175 | -} | |
| 176 | -#assets_menu li { | |
| 177 | - margin: 0px; | |
| 178 | - padding: 0px 4px; | |
| 179 | - float: left; | |
| 180 | - width: 22px; | |
| 181 | - height: 20px; | |
| 182 | - position: relative; | |
| 183 | -} | |
| 184 | - | |
| 185 | -#assets_menu a { | |
| 186 | - letter-spacing: 0px; | |
| 187 | - color: #FFF; | |
| 188 | - position: absolute; | |
| 189 | - left: 0px; | |
| 190 | - top: 0px; | |
| 191 | - overflow: visible; | |
| 192 | - opacity: 0.6; | |
| 193 | - filter: alpha(opacity=60); | |
| 194 | -} | |
| 195 | -.msie #assets_menu a { | |
| 196 | - width: 100px; | |
| 197 | - height: 20px; | |
| 198 | - margin-left: 0px; | |
| 199 | - cursor: pointer; | |
| 200 | -} | |
| 201 | -#assets_menu a:hover { | |
| 202 | - background: transparent; | |
| 203 | - opacity: 1; | |
| 204 | - filter: alpha(opacity=100); | |
| 205 | -} | |
| 206 | -.msie #assets_menu a:hover { | |
| 207 | - height: 40px; | |
| 208 | -} | |
| 209 | - | |
| 210 | -#assets_menu a strong { | |
| 211 | - position: absolute; | |
| 212 | - top: 20px; | |
| 213 | - left: -10px; | |
| 214 | - background: #F57900; | |
| 215 | - border: 1px solid #A40000; | |
| 216 | - padding: 1px 4px; | |
| 217 | - display: none; | |
| 218 | -} | |
| 219 | -.msie #assets_menu a strong { | |
| 220 | - left: 0px; | |
| 221 | -} | |
| 222 | - | |
| 223 | -.msie #assets_menu a span { | |
| 224 | - left: 10px; | |
| 225 | -} | |
| 226 | - | |
| 227 | -#assets_menu a:hover strong { | |
| 228 | - display: block; | |
| 229 | - -moz-border-radius: 4px; | |
| 230 | -} | |
| 231 | - | |
| 232 | 232 | /* * * Language Selector * * * * * * * * * */ |
| 233 | 233 | |
| 234 | 234 | #language-selector { | ... | ... |
public/javascripts/auto-open-menu.js
| ... | ... | @@ -27,6 +27,7 @@ function setAutoOpenMenu( menu ) { |
| 27 | 27 | this.className = this.className.replace( / closed/g, "" ); |
| 28 | 28 | if ( !/menu-opened/.test(this.className) ) { this.className += " opened" } |
| 29 | 29 | var mul = this.mul; |
| 30 | + mul.style.display = "block"; | |
| 30 | 31 | if ( mul.paddingBottom ) mul.parentNode.style.paddingBottom = mul.paddingBottom +"px"; |
| 31 | 32 | if ( mul.h < mul.maxSize ) { |
| 32 | 33 | mul.h += mul.inc; |
| ... | ... | @@ -48,6 +49,7 @@ function setAutoOpenMenu( menu ) { |
| 48 | 49 | if ( mul.h > mul.minSize ) { |
| 49 | 50 | mul.h -= mul.inc++; |
| 50 | 51 | if ( mul.h < 0 ) mul.h = 0; |
| 52 | + if ( mul.h == 0 ) mul.style.display = "none"; | |
| 51 | 53 | if ( this.isIE ) if ( mul.h < 1 ) mul.h = 1; |
| 52 | 54 | mul.style.height = mul.h +"px"; |
| 53 | 55 | this.timeoutClose = setTimeout( "window['autoOpenMenu-"+this.id+"'].onmouseout(true)", 33 ); | ... | ... |
public/javascripts/lightbox.js
public/stylesheets/button.css
public/stylesheets/common.css
public/stylesheets/controller_search.css
public/stylesheets/help.css
public/stylesheets/menu.css
| ... | ... | @@ -8,19 +8,26 @@ |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | #noosfero_bar { |
| 11 | - position: absolute; | |
| 12 | - left: 0px; | |
| 13 | - right: 0px; | |
| 14 | 11 | height: 22px; |
| 15 | - z-index: 100; | |
| 16 | 12 | font-size: 11px; |
| 17 | 13 | letter-spacing: -1px; |
| 18 | 14 | background: #2A5896 url(../images/white-pixel.gif) 0px 100% repeat-x; |
| 19 | 15 | } |
| 20 | 16 | |
| 21 | 17 | #navigation_bar { |
| 22 | - width: 100%; /* MSIE workarround bug */ | |
| 18 | + position: absolute; | |
| 19 | + top: 0px; | |
| 20 | + left: 0px; | |
| 21 | + right: 0px; | |
| 22 | + z-index: 100; | |
| 23 | 23 | } |
| 24 | +#navigation_bar a { | |
| 25 | + font-weight: bold; | |
| 26 | + line-height: 22px; | |
| 27 | + text-decoration: none; | |
| 28 | + color: #FFF; | |
| 29 | +} | |
| 30 | + | |
| 24 | 31 | |
| 25 | 32 | #menu_link_to_envhome { |
| 26 | 33 | float: left; |
| ... | ... | @@ -30,9 +37,9 @@ |
| 30 | 37 | padding: 0px; |
| 31 | 38 | margin: 0px; |
| 32 | 39 | } |
| 33 | -.msie #cat_menu { | |
| 40 | +.msie6 #cat_menu { | |
| 34 | 41 | width: 100%; |
| 35 | - position: relative; | |
| 42 | + margin-top: -22px; | |
| 36 | 43 | } |
| 37 | 44 | |
| 38 | 45 | #cat_menu .linkSubMenu, |
| ... | ... | @@ -40,13 +47,6 @@ |
| 40 | 47 | background-color: #5380B8; |
| 41 | 48 | } |
| 42 | 49 | |
| 43 | -#cat_menu a { | |
| 44 | - font-weight: bold; | |
| 45 | - line-height: 22px; | |
| 46 | - text-decoration: none; | |
| 47 | - color: #FFF; | |
| 48 | -} | |
| 49 | - | |
| 50 | 50 | .linkSubMenu { |
| 51 | 51 | cursor: default; |
| 52 | 52 | float: left; |
| ... | ... | @@ -59,6 +59,10 @@ |
| 59 | 59 | background-image: url(../images/borda-esq-aba-azul.gif); |
| 60 | 60 | border-right: 1px solid #FFF; |
| 61 | 61 | } |
| 62 | +.msie6 .linkSubMenu { | |
| 63 | + position: relative; | |
| 64 | + left: 100px; | |
| 65 | +} | |
| 62 | 66 | .linkSubMenu span { |
| 63 | 67 | display: block; |
| 64 | 68 | line-height: 22px; |
| ... | ... | @@ -91,37 +95,42 @@ |
| 91 | 95 | border: 1px solid #FFF; |
| 92 | 96 | border-top: none; |
| 93 | 97 | } |
| 94 | -.msie #cat_menu ul { | |
| 95 | - /* width: 100%; */ | |
| 96 | -} | |
| 97 | 98 | |
| 98 | 99 | #cat_menu ul a { |
| 99 | 100 | background: url(../images/bolota.gif) 0% 50% no-repeat; |
| 100 | 101 | padding-left: 15px; |
| 101 | 102 | margin-left: -10px; |
| 103 | + white-space: nowrap; | |
| 102 | 104 | } |
| 103 | 105 | #cat_menu ul span { |
| 104 | 106 | background: url(../images/bolota.gif) 100% 50% no-repeat; |
| 105 | 107 | padding-right: 15px; |
| 106 | 108 | } |
| 107 | 109 | |
| 108 | -/* * * Assets Menu * * * * * * * * * * * */ | |
| 110 | +/* * * Assets Menu and User Box * * * * * * * * * * * */ | |
| 109 | 111 | |
| 110 | 112 | #assets_menu { |
| 111 | 113 | position: absolute; |
| 112 | - top: 21px; | |
| 114 | + top: 0px; | |
| 113 | 115 | right: 0px; |
| 114 | 116 | padding: 0px 0px 0px 10px; |
| 115 | 117 | border: none; /* work arround IE Bug */ |
| 116 | 118 | background: transparent; /* work arround IE Bug */ |
| 119 | + width: 150px; | |
| 117 | 120 | } |
| 118 | 121 | .msie6 #assets_menu { |
| 119 | 122 | right: -1px; |
| 120 | 123 | } |
| 121 | 124 | |
| 125 | +#assets_menu a#open_search { | |
| 126 | + display: block; | |
| 127 | + height: 21px; | |
| 128 | + margin-left: 5px; | |
| 129 | +} | |
| 130 | + | |
| 122 | 131 | #assets_menu_layout_iten { |
| 123 | 132 | position: absolute; |
| 124 | - top: 0px; | |
| 133 | + top: 21px; | |
| 125 | 134 | left: 0px; |
| 126 | 135 | width: 11px; |
| 127 | 136 | height: 11px; |
| ... | ... | @@ -137,10 +146,12 @@ |
| 137 | 146 | #assets_menu ul { |
| 138 | 147 | margin: 0px; |
| 139 | 148 | padding: 0px; |
| 149 | + position: relative; /* work arround IE Bug */ | |
| 140 | 150 | overflow: hidden; |
| 141 | 151 | height: 56px; |
| 142 | - max-width: 135px; | |
| 143 | - width: 136px; | |
| 152 | +} | |
| 153 | +.msie #assets_menu ul { | |
| 154 | + height: 55px; | |
| 144 | 155 | } |
| 145 | 156 | |
| 146 | 157 | .top_extra_menu li { |
| ... | ... | @@ -149,11 +160,20 @@ |
| 149 | 160 | list-style: none; |
| 150 | 161 | } |
| 151 | 162 | |
| 163 | +#user_box { | |
| 164 | + position: absolute; | |
| 165 | + top: 3px; | |
| 166 | + right: 170px; | |
| 167 | + width: 150px; | |
| 168 | + z-index: 100; | |
| 169 | +} | |
| 170 | + | |
| 152 | 171 | #user_menu_head, |
| 153 | 172 | #user_box a, |
| 154 | 173 | #assets_menu a, |
| 155 | 174 | .top_extra_menu a { |
| 156 | 175 | font-size: 12px; |
| 176 | + line-height: 18px; | |
| 157 | 177 | font-weight: bold; |
| 158 | 178 | text-decoration: none; |
| 159 | 179 | color: #B8CFE7; |
| ... | ... | @@ -178,7 +198,7 @@ |
| 178 | 198 | |
| 179 | 199 | #user_box img, |
| 180 | 200 | #user_box a span, |
| 181 | -.top_extra_menu a span { | |
| 201 | +#assets_menu a span { | |
| 182 | 202 | position: absolute; |
| 183 | 203 | top: 0px; |
| 184 | 204 | left: 0px; |
| ... | ... | @@ -191,51 +211,31 @@ |
| 191 | 211 | opacity: 0.7; |
| 192 | 212 | filter: alpha(opacity=70); |
| 193 | 213 | } |
| 214 | +#assets_menu a#open_search span { | |
| 215 | + top: 1px; | |
| 216 | +} | |
| 194 | 217 | /*.msie5 #user_box img,*/ |
| 195 | 218 | .msie5 #user_box a span, |
| 196 | -.msie5 .top_extra_menu a span { | |
| 219 | +.msie5 #assets_menu a span { | |
| 197 | 220 | display: none; |
| 198 | 221 | } |
| 199 | 222 | #user_box img, |
| 200 | 223 | #user_box a:hover span, |
| 201 | -.top_extra_menu a:hover span { | |
| 224 | +#assets_menu a:hover span { | |
| 202 | 225 | opacity: 1; |
| 203 | 226 | filter: alpha(opacity=100); |
| 204 | 227 | } |
| 205 | 228 | #user_box img { |
| 206 | 229 | border: none; |
| 207 | - top: -1px; | |
| 230 | + top: -2px; | |
| 208 | 231 | left: -1px; |
| 209 | 232 | width: 20px; |
| 210 | 233 | height: 20px; |
| 211 | 234 | } |
| 212 | 235 | |
| 213 | -/* * * User Box * * * * * * * * * * * */ | |
| 214 | - | |
| 215 | -#user_box { | |
| 216 | - position: absolute; | |
| 217 | - top: 0px; | |
| 218 | - right: 0px; | |
| 219 | - width: 150px; | |
| 220 | -} | |
| 221 | - | |
| 222 | -#open_search { | |
| 223 | - position: absolute; | |
| 224 | - top: 2px; | |
| 225 | - left: 14px; | |
| 226 | - float: left; | |
| 227 | -} | |
| 228 | -#user_box #open_search:hover { | |
| 229 | - background: none; | |
| 230 | -} | |
| 231 | - | |
| 232 | 236 | /* * * User Menu * * * * * * * * * * * */ |
| 233 | 237 | |
| 234 | 238 | #user_menu { |
| 235 | - position: absolute; | |
| 236 | - top: 0px; | |
| 237 | - right: 150px; | |
| 238 | - width: 170px; | |
| 239 | 239 | border: none; /* work arround IE Bug */ |
| 240 | 240 | background: transparent; /* work arround IE Bug */ |
| 241 | 241 | } |
| ... | ... | @@ -247,11 +247,12 @@ |
| 247 | 247 | #user_menu_head span { |
| 248 | 248 | position: relative; |
| 249 | 249 | top: 1px; |
| 250 | + left: 1px; | |
| 250 | 251 | } |
| 251 | 252 | |
| 252 | 253 | #user_menu_head, |
| 253 | 254 | #user_box a#link_login { |
| 254 | - margin-left: 25px; | |
| 255 | + margin-left: 4px; | |
| 255 | 256 | display: inline; |
| 256 | 257 | } |
| 257 | 258 | #user_menu a#link_login:hover { |
| ... | ... | @@ -279,6 +280,7 @@ |
| 279 | 280 | width: 150px; |
| 280 | 281 | max-width: 140px; |
| 281 | 282 | height: 0px; |
| 283 | + position: relative; /* work arround IE Bug */ | |
| 282 | 284 | overflow: hidden; |
| 283 | 285 | padding: 0px 4px 0px 5px; |
| 284 | 286 | margin: 0px; |
| ... | ... | @@ -298,6 +300,7 @@ |
| 298 | 300 | position: absolute; |
| 299 | 301 | left: 90px; |
| 300 | 302 | top: 5px; |
| 303 | + z-index: 100; | |
| 301 | 304 | font-size: 10px; |
| 302 | 305 | opacity: 0.7; |
| 303 | 306 | filter: alpha(opacity=70); | ... | ... |
script/change-theme
| 1 | 1 | #!/bin/bash |
| 2 | 2 | |
| 3 | +t_ini="$1" | |
| 4 | + | |
| 3 | 5 | cd "$( dirname $0 )/../public/designs/themes/" |
| 4 | 6 | |
| 5 | 7 | test -L default && rm default |
| ... | ... | @@ -14,7 +16,12 @@ done |
| 14 | 16 | ok=false |
| 15 | 17 | while ! [ -L default ]; do |
| 16 | 18 | |
| 17 | - read t | |
| 19 | + if [ "$t_ini" = "" ]; then | |
| 20 | + read t | |
| 21 | + else | |
| 22 | + t="$t_ini" | |
| 23 | + t_ini="" | |
| 24 | + fi | |
| 18 | 25 | n=0 |
| 19 | 26 | ls -1 | while read theme; do |
| 20 | 27 | let n++ | ... | ... |