Commit 4f2e4839d51654ab8c7df4c428a0bc2938d71e84
1 parent
3c4fe9d3
Exists in
master
and in
29 other branches
ActionItem70: adding user links to the "My account" page to accomodate the new layout
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@508 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
6 changed files
with
40 additions
and
45 deletions
Show diff stats
app/helpers/application_helper.rb
| ... | ... | @@ -109,18 +109,14 @@ module ApplicationHelper |
| 109 | 109 | # FIXME: uncomment "My enterprises" links |
| 110 | 110 | def user_links |
| 111 | 111 | links = [ |
| 112 | + ( link_to_homepage(current_user.login) ), | |
| 112 | 113 | ( link_to(_('My account'), { :controller => 'account' }) ), |
| 113 | - ( link_to_myprofile(_('My profile'), { :controller => 'profile_editor' }) ), | |
| 114 | - ( link_to_homepage(_('My home page')) ), | |
| 115 | - ( link_to_cms(_('Manage content')) ), | |
| 116 | - ( link_to (_('Manage layout')), :controller => 'edit_template' ), | |
| 117 | - #( link_to_myprofile(_('My enterprises'), { :controller => 'enterprise' }) ), | |
| 118 | 114 | ].join("\n") |
| 119 | 115 | content_tag('span', links, :id => 'user_links') |
| 120 | 116 | end |
| 121 | 117 | |
| 122 | 118 | def header |
| 123 | - virtual_community_identification + "\n" + login_or_register_or_logout | |
| 119 | + login_or_register_or_logout | |
| 124 | 120 | end |
| 125 | 121 | |
| 126 | 122 | def login_or_register_or_logout | ... | ... |
app/views/account/index.rhtml
| ... | ... | @@ -11,6 +11,17 @@ |
| 11 | 11 | </p> |
| 12 | 12 | |
| 13 | 13 | <p> |
| 14 | +<%= link_to_homepage(_('My home page.')) %> | |
| 15 | +<%= _('See your homepage.') %> | |
| 16 | +</p> | |
| 17 | + | |
| 18 | +<p> | |
| 19 | +<%= link_to_homepage(_('Manage content.')) %> | |
| 20 | +<%= _('Manage your content.') %> | |
| 21 | +</p> | |
| 22 | + | |
| 23 | + | |
| 24 | +<p> | |
| 14 | 25 | <%= link_to _('Logout.'), :action => 'logout' %> |
| 15 | 26 | <%= _('It is always a good idea to make a logout when you finish using the virtual community.')%> |
| 16 | 27 | </p> | ... | ... |
app/views/layouts/application.rhtml
| ... | ... | @@ -106,11 +106,12 @@ |
| 106 | 106 | <input type='submit' value='Buscar'> |
| 107 | 107 | </form> |
| 108 | 108 | </div><!-- id='search_box' --> |
| 109 | + | |
| 110 | + <div id="header"> | |
| 111 | + <%= header %> | |
| 112 | + </div> | |
| 109 | 113 | </div><!-- id="noosfero_bar" --> |
| 110 | 114 | |
| 111 | - <%# <div id="header"> %> | |
| 112 | - <%# header %> | |
| 113 | - <%# </div> %> | |
| 114 | 115 | |
| 115 | 116 | <div id='content'> |
| 116 | 117 | <!-- <a name='main_content'/></a> --> | ... | ... |
public/designs/templates/default/stylesheets/style.css
| ... | ... | @@ -10,12 +10,6 @@ body { |
| 10 | 10 | /*background: url("../images/bg_bgheader.png") repeat-x;*/ |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | -#header_content { | |
| 14 | -background: url("../images/fbes.png") 20px no-repeat; | |
| 15 | -height: 48px; | |
| 16 | -padding-top: 10px; | |
| 17 | -} | |
| 18 | - | |
| 19 | 13 | #boxes { |
| 20 | 14 | position: relative; |
| 21 | 15 | width: 760px; | ... | ... |
public/stylesheets/common.css
| ... | ... | @@ -36,28 +36,6 @@ padding-left: 60px !important ; |
| 36 | 36 | color: #dfdfdf !important ; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -#header { | |
| 40 | - position: relative !important; | |
| 41 | - margin: 0px !important; | |
| 42 | - padding: 0px !important; | |
| 43 | - height: 35px !important; | |
| 44 | - background: #fff url("../images/bg_blue_bar.png") bottom left repeat-x !important; | |
| 45 | - color: #ffffff !important ; | |
| 46 | -} | |
| 47 | - | |
| 48 | - | |
| 49 | -#header a { | |
| 50 | -display: table-cell !important ; | |
| 51 | -height: 35px !important ; | |
| 52 | -color: #ffffff !important ; | |
| 53 | -font-size: 10px !important ; | |
| 54 | -font-family: Sans-serif !important ; | |
| 55 | -font-weight: bold !important ; | |
| 56 | -vertical-align: middle !important ; | |
| 57 | -padding: 0px 5px 0px 5px !important ; | |
| 58 | -text-decoration: underline !important ; | |
| 59 | -} | |
| 60 | - | |
| 61 | 39 | #user_links, #login_box { |
| 62 | 40 | margin-left: 290px !important ; |
| 63 | 41 | } | ... | ... |
public/stylesheets/menu.css
| ... | ... | @@ -21,10 +21,6 @@ padding: 0px; |
| 21 | 21 | z-index: 100; |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | -#content { | |
| 25 | - margin-top: 40px; | |
| 26 | -} | |
| 27 | - | |
| 28 | 24 | #noosfero_bar *:focus { |
| 29 | 25 | color: red !important; |
| 30 | 26 | } |
| ... | ... | @@ -90,7 +86,6 @@ padding: 0px; |
| 90 | 86 | background: #204a87 url("../images/bg_noosfero_bar.png") repeat-x; |
| 91 | 87 | } |
| 92 | 88 | |
| 93 | -/* FIXME: add another categories */ | |
| 94 | 89 | #wrap.category1 { |
| 95 | 90 | border: 6px solid #204a87 !important; |
| 96 | 91 | } |
| ... | ... | @@ -127,7 +122,7 @@ li#category1 ul li a { |
| 127 | 122 | } |
| 128 | 123 | |
| 129 | 124 | #wrap.category2 { |
| 130 | -border: 3px solid #a40000 !important; | |
| 125 | +border: 6px solid #a40000 !important; | |
| 131 | 126 | } |
| 132 | 127 | |
| 133 | 128 | #category2 a { |
| ... | ... | @@ -157,7 +152,7 @@ li#category2.active a { |
| 157 | 152 | } |
| 158 | 153 | |
| 159 | 154 | #wrap.category3 { |
| 160 | -border: 3px solid #204a87 !important; | |
| 155 | +border: 6px solid #204a87 !important; | |
| 161 | 156 | } |
| 162 | 157 | |
| 163 | 158 | #category3 a { |
| ... | ... | @@ -192,7 +187,7 @@ li#category3 ul li a { |
| 192 | 187 | } |
| 193 | 188 | |
| 194 | 189 | #wrap.category4 { |
| 195 | -border: 3px solid #a40000 !important; | |
| 190 | +border: 6px solid #a40000 !important; | |
| 196 | 191 | } |
| 197 | 192 | |
| 198 | 193 | #category4 a { |
| ... | ... | @@ -230,4 +225,24 @@ clear: both; |
| 230 | 225 | } |
| 231 | 226 | |
| 232 | 227 | #content { |
| 228 | + margin-top: 50px; | |
| 229 | +} | |
| 230 | + | |
| 231 | +#header { | |
| 232 | + clear: left; | |
| 233 | + background: #204a87; | |
| 234 | + padding: 3px; | |
| 235 | + text-align: left; | |
| 236 | + margin-left: -290px; | |
| 237 | +} | |
| 238 | + | |
| 239 | +#header a { | |
| 240 | +height: 35px !important ; | |
| 241 | +color: #ffffff !important ; | |
| 242 | +font-size: 10px !important ; | |
| 243 | +font-family: Sans-serif !important ; | |
| 244 | +font-weight: bold !important ; | |
| 245 | +vertical-align: middle !important ; | |
| 246 | +padding: 0px 5px 0px 5px !important ; | |
| 247 | +text-decoration: underline !important ; | |
| 233 | 248 | } | ... | ... |