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

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
AntonioTerceiro
1 parent 3c4fe9d3
Showing 6 changed files with 40 additions and 45 deletions Show diff stats
app/helpers/application_helper.rb
app/views/account/index.rhtml
app/views/layouts/application.rhtml
public/designs/templates/default/stylesheets/style.css
public/stylesheets/common.css
public/stylesheets/menu.css
@@ -109,18 +109,14 @@ module ApplicationHelper
   # FIXME: uncomment "My enterprises" links
   def user_links
     links = [
+       ( link_to_homepage(current_user.login) ),
        ( link_to(_('My account'), { :controller => 'account' }) ),
-       ( link_to_myprofile(_('My profile'), { :controller => 'profile_editor' }) ),
-       ( link_to_homepage(_('My home page')) ),
-       ( link_to_cms(_('Manage content')) ),
-       ( link_to (_('Manage layout')), :controller => 'edit_template' ),
-       #( link_to_myprofile(_('My enterprises'), { :controller => 'enterprise' }) ),
     ].join("\n")
     content_tag('span', links, :id => 'user_links')
   end
   def header
-    virtual_community_identification + "\n" + login_or_register_or_logout
+    login_or_register_or_logout
   end
   def login_or_register_or_logout
@@ -11,6 +11,17 @@
 </p>
 <p>
+<%= link_to_homepage(_('My home page.')) %>
+<%= _('See your homepage.') %>
+</p>
+
+<p>
+<%= link_to_homepage(_('Manage content.')) %>
+<%= _('Manage your content.') %>
+</p>
+
+
+<p>
 <%= link_to _('Logout.'), :action => 'logout' %>
 <%= _('It is always a good idea to make a logout when you finish using the virtual community.')%>
 </p>
@@ -106,11 +106,12 @@
             <input type='submit' value='Buscar'>
           </form>
         </div><!-- id='search_box' -->
+
+        <div id="header">
+          <%= header %>
+        </div>
       </div><!-- id="noosfero_bar" -->
-      <%#  <div id="header"> %>
-        <%# header %>
-      <%# </div> %>
       <div id='content'>
         <!-- <a name='main_content'/></a> -->
@@ -10,12 +10,6 @@ body {
 /*background: url("../images/bg_bgheader.png") repeat-x;*/
 }
-#header_content {
-background: url("../images/fbes.png") 20px no-repeat;
-height: 48px;
-padding-top: 10px;
-}
-
 #boxes {
   position: relative;
   width: 760px;
@@ -36,28 +36,6 @@ padding-left: 60px !important ;
 color: #dfdfdf !important ;
 }
-#header {
-  position: relative !important;
-  margin: 0px !important;
-  padding: 0px !important;
-  height: 35px !important;
-  background: #fff url("../images/bg_blue_bar.png") bottom left repeat-x !important;
-  color: #ffffff !important ;
-}
-
-
-#header a {
-display: table-cell !important ;
-height: 35px !important ;
-color: #ffffff !important ;
-font-size: 10px !important ;
-font-family: Sans-serif !important ;
-font-weight: bold !important ;
-vertical-align: middle !important ;
-padding: 0px 5px 0px 5px !important ;
-text-decoration: underline !important ;
-}
-
 #user_links, #login_box {
 margin-left: 290px !important ;
 }
@@ -21,10 +21,6 @@ padding: 0px;
   z-index: 100;
 }
-#content {
-  margin-top: 40px;
-}
-
 #noosfero_bar *:focus {
   color: red !important;
 }
@@ -90,7 +86,6 @@ padding: 0px;
   background: #204a87 url("../images/bg_noosfero_bar.png") repeat-x;
 }
-/* FIXME: add another categories */
 #wrap.category1 {
 border: 6px solid #204a87 !important;
 }
@@ -127,7 +122,7 @@ li#category1 ul li a {
 }
 #wrap.category2 {
-border: 3px solid #a40000 !important;
+border: 6px solid #a40000 !important;
 }
 #category2 a {
@@ -157,7 +152,7 @@ li#category2.active a {
 }
 #wrap.category3 {
-border: 3px solid #204a87 !important;
+border: 6px solid #204a87 !important;
 }
 #category3 a {
@@ -192,7 +187,7 @@ li#category3 ul li a {
 }
 #wrap.category4 {
-border: 3px solid #a40000 !important;
+border: 6px solid #a40000 !important;
 }
 #category4 a {
@@ -230,4 +225,24 @@ clear: both;
 }
 #content {
+  margin-top: 50px;
+}
+
+#header {
+  clear: left;
+  background: #204a87;
+  padding: 3px;
+  text-align: left;
+  margin-left: -290px;
+}
+
+#header a {
+height: 35px !important ;
+color: #ffffff !important ;
+font-size: 10px !important ;
+font-family: Sans-serif !important ;
+font-weight: bold !important ;
+vertical-align: middle !important ;
+padding: 0px 5px 0px 5px !important ;
+text-decoration: underline !important ;
 }
	@@ -11,6 +11,17 @@		@@ -11,6 +11,17 @@
11	</p>	11	</p>
12		12
13	<p>	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	<%= link_to _('Logout.'), :action => 'logout' %>	25	<%= link_to _('Logout.'), :action => 'logout' %>
15	<%= _('It is always a good idea to make a logout when you finish using the virtual community.')%>	26	<%= _('It is always a good idea to make a logout when you finish using the virtual community.')%>
16	</p>	27	</p>
	@@ -10,12 +10,6 @@ body {		@@ -10,12 +10,6 @@ body {
10	/background: url("../images/bg_bgheader.png") repeat-x;/	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	#boxes {	13	#boxes {
20	position: relative;	14	position: relative;
21	width: 760px;	15	width: 760px;
	@@ -36,28 +36,6 @@ padding-left: 60px !important ;		@@ -36,28 +36,6 @@ padding-left: 60px !important ;
36	color: #dfdfdf !important ;	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	#user_links, #login_box {	39	#user_links, #login_box {
62	margin-left: 290px !important ;	40	margin-left: 290px !important ;
63	}	41	}