diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c499851..764b4d4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -251,8 +251,8 @@ module ApplicationHelper def footer # FIXME: add some information from the environment [ - content_tag('div', 'some information about this environment'), - content_tag('div', _('%s, version %s' % [ link_to(Noosfero::PROJECT, 'http://www.colivre.coop.br/Noosfero'), Noosfero::VERSION])), + content_tag('div', 'Copyright © 2007, Noosfero - Change Me!'), + content_tag('div', _('%s, version %s' % [ link_to('developers', 'http://www.colivre.coop.br/Noosfero'), Noosfero::VERSION])), ].join("\n") end diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb index f369ba9..5f2bc8e 100644 --- a/app/helpers/categories_helper.rb +++ b/app/helpers/categories_helper.rb @@ -4,10 +4,10 @@ module CategoriesHelper COLORS = [ [ N_('Do not display at the menu'), nil ], - [ N_('Blue'), 1 ], - [ N_('Red'), 2 ], - [ N_('Green'), 3 ], - [ N_('Orange'), 4 ], + [ N_('Orange'), 1 ], + [ N_('Green'), 2 ], + [ N_('Purple'), 3 ], + [ N_('Red'), 4 ], ] TYPES = [ diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index b828a3d..dbcd491 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -119,7 +119,6 @@ diff --git a/public/artwork/screens/NoosferoTelaDeslogado.svg b/public/artwork/screens/NoosferoTelaDeslogado.svg index 0f6ee47..7e7f7ea 100644 --- a/public/artwork/screens/NoosferoTelaDeslogado.svg +++ b/public/artwork/screens/NoosferoTelaDeslogado.svg @@ -669,46 +669,6 @@ gradientTransform="translate(6,0)" /> - - - - - - - - - - - - - - - - - - - - - - @@ -919,16 +811,18 @@ d="M -712.96875,231.09375 C -719.38754,231.09375 -724.5938,236.29997 -724.5938,242.71875 L -724.5938,301.75 C -724.5938,308.16879 -719.38752,313.37501 -712.96875,313.375 L -468.9375,313.375 C -462.51871,313.375 -457.3125,308.16879 -457.3125,301.75 L -457.3125,242.71875 C -457.3125,236.29996 -462.51874,231.09375 -468.9375,231.09375 L -712.96875,231.09375 z" id="path10409" /> - + id="filter3274" + x="-0.040876122" + width="1.0817522" + y="-0.14321764" + height="1.2864353"> + + + x="-1130.626" + y="44.878323" /> + transform="matrix(1,0,0,-1,2.8728777,12.774572)" /> - - - - diff --git a/public/images/bg_bgmenu.png b/public/images/bg_bgmenu.png index 5b962e2..6016334 100644 Binary files a/public/images/bg_bgmenu.png and b/public/images/bg_bgmenu.png differ diff --git a/public/images/bg_menu_options.png b/public/images/bg_menu_options.png index 4341c2e..6e14a4c 100644 Binary files a/public/images/bg_menu_options.png and b/public/images/bg_menu_options.png differ diff --git a/public/stylesheets/menu.css b/public/stylesheets/menu.css index d7faec1..e251925 100644 --- a/public/stylesheets/menu.css +++ b/public/stylesheets/menu.css @@ -1,7 +1,8 @@ /* Geral Bar */ #noosfero_bar { position: fixed; - height: 11px; + height: 26px; + background: url("../images/bg_bgmenu.png") repeat-x; padding: 0px; margin-top: -5px; margin-right: 5px; @@ -136,8 +137,6 @@ width: 200px; height: 35px; padding-top: 5px; padding-left: 15px; -background: url("../images/bg_searchbox.png") no-repeat; -background-position: bottom left; } #input_search { @@ -174,22 +173,20 @@ border: 1px inset #dfdfdf; /* Itens Colors Change */ /* ITEM 0 */ - -#noosfero_bar.category { - background: url("../images/bg_bgmenu.png") repeat-x; - background-position: 0px -11px; +#noosfero_bar.category div#search_box { +background-color: #245090; } #navigation_bar ul li#category ul { - background-color: #204a87 !important; + background-color: #245090 !important; } #wrap.category { - border: 5px solid #204a87 !important; + border: 5px solid #245090 !important; } #top_bar.category { -background-color: #204a87; +background-color: #245090; } #category a { @@ -207,8 +204,8 @@ background-position: 0px -76px !important; li#category ul li a { color: white; - background: #204a87; - border-right: 1px solid black; + background: #245090; + border-right: 1px solid white; } li#category ul li a:hover { @@ -216,21 +213,20 @@ li#category ul li a:hover { } /* ITEM 1 - Orange */ -#noosfero_bar.category1 { - background: url("../images/bg_bgmenu.png") repeat-x; - background-position: 0px 0px; +#noosfero_bar.category1 div#search_box { +background-color: #da6303; } #navigation_bar ul li#category1 ul { - background-color: #ce5c00 !important; + background-color: #da6303 !important; } #wrap.category1 { -border: 5px solid #ce5c00 !important; +border: 5px solid #da6303 !important; } #top_bar.category1 { -background-color: #ce5c00; +background-color: #da6303; } #category1 a { @@ -248,8 +244,8 @@ background-position: -124px -76px !important; li#category1 ul li a { color: white; - background: #ce5c00; - border-right: 1px solid black; + background: #da6303; + border-right: 1px solid white; } li#category1 ul li a:hover { @@ -257,21 +253,20 @@ li#category1 ul li a:hover { } /* ITEM 2 - Green */ -#noosfero_bar.category2 { - background: url("../images/bg_bgmenu.png") repeat-x; - background-position: 0px -22px; +#noosfero_bar.category2 div#search_box { +background-color: #54a409; } #navigation_bar ul li#category2 ul { - background-color: #4e9a06 !important; + background-color: #54a409 !important; } #wrap.category2 { -border: 5px solid #4e9a06 !important; +border: 5px solid #54a409 !important; } #top_bar.category2 { -background-color: #4e9a06; +background-color: #54a409; } #category2 a { @@ -289,8 +284,8 @@ background-position: -246px -76px !important; li#category2 ul li a { color: white; - background: #4e9a06; - border-right: 1px solid black; + background: #54a409; + border-right: 1px solid white; } li#category2 ul li a:hover { @@ -298,21 +293,20 @@ li#category2 ul li a:hover { } /* ITEM 3 - Purple */ -#noosfero_bar.category3 { - background: url("../images/bg_bgmenu.png") repeat-x; - background-position: 0px -33px; +#noosfero_bar.category3 div#search_box { +background-color: #633a6d; } #navigation_bar ul li#category3 ul { - background-color: #5c3566 !important; + background-color: #633a6d !important; } #wrap.category3 { -border: 5px solid #5c3566 !important; +border: 5px solid #633a6d !important; } #top_bar.category3 { -background-color: #5c3566; +background-color: #633a6d; } #category3 a { @@ -330,8 +324,8 @@ background-position: -368px -76px !important; li#category3 ul li a { color: white; - background: #5c3566; - border-right: 1px solid black; + background: #633a6d; + border-right: 1px solid white; } li#category3 ul li a:hover { @@ -339,9 +333,8 @@ li#category3 ul li a:hover { } /* ITEM 4 - Red */ -#noosfero_bar.category4 { - background: url("../images/bg_bgmenu.png") repeat-x; - background-position: 0px -44px; +#noosfero_bar.category4 div#search_box { +background-color: #ae0303; } #navigation_bar ul li#category4 ul { @@ -372,13 +365,9 @@ background-position: -494px -76px !important; li#category4 ul li a { color: white; background: #ae0303; - border-right: 1px solid black; + border-right: 1px solid white; } li#category4 ul li a:hover { color: black; } - -div#user_options *{ - color: white; -} -- libgit2 0.21.2