diff --git a/app/controllers/cms_controller.rb b/app/controllers/cms_controller.rb index e545aed..0380d03 100644 --- a/app/controllers/cms_controller.rb +++ b/app/controllers/cms_controller.rb @@ -1,2 +1,3 @@ class CmsController < ComatoseAdminController + self.template_root = File.join(File.dirname(__FILE__), '..', 'views') end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 87cb7b0..9c01657 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -96,7 +96,7 @@ module ApplicationHelper ( link_to_cms(_('Manage content')) ), ( link_to (_('Manage layout')), :controller => 'edit_template' ), ( link_to(_('My enterprises'), { :controller => 'enterprise' }) ), - ].join("\n") + ].join(" | \n") content_tag('span', links, :id => 'user_links') end @@ -124,6 +124,10 @@ module ApplicationHelper content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') end + # renders a search box. + def search_box + end + # FIXME def footer 'nothing in the footer yet' diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index bc24ee1..d9af85a 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -7,6 +7,35 @@ <%= stylesheet_link_tag 'cms' %> <% end %> <%= stylesheet_link_tag 'common' %> + <%= stylesheet_link_tag 'blue_bar' %> + + @@ -23,20 +52,51 @@
+
Default Virtual Community
+ + +
+ + +
+ +
- + + + +
+ --> + <% if params[:controller] == 'cms' %>
<%= yield %> diff --git a/public/stylesheets/blue_bar.css b/public/stylesheets/blue_bar.css new file mode 100644 index 0000000..d6e8723 --- /dev/null +++ b/public/stylesheets/blue_bar.css @@ -0,0 +1,188 @@ +/* Default Bar theme Blue Sky */ +#frame { + background: #fff url("../images/black_white_12px.png") repeat-x; +} + +#menu_accessibility { + font-size: 10px; + color: black; + font-family: Sans-serif; + color: #545454; +} + + +#menu_accessibility a { + color: #545454; + text-decoration: none; +} + +#menu_accessibility a:hover { + color: #000000; + text-decoration: underline; +} + +#menu_accessibility a:focus { + color: #ef2929; + text-decoration: underline; +} + +#header { + background: #fff url("../images/bg_blue_bar.png") left bottom repeat-x; + font-family: Verdana, Sans-serif; + height: 40px; + color: #ffffff; +} + +#virtual_community_identification { +float: left; +background: url("../images/bg_blue_logo.png") left bottom no-repeat; +vertical-align: bottom; +font-weight:bold; +width: 230px; +height: 40px; +line-height: 40px; +padding-left: 60px; +} + +#bar_center_content { +position: relative; +margin-left: 290px; +margin-right: 120px; +text-align: center; +font-size: 13px; +height: 40px; +} + +#user_links { +float: right; +text-align: center; +color: #204a87; +font-size: 12px; +width: 120px; +height: 40px; +} + +#user_links a { +color: #ffffff; +padding-left: 5px; +padding-right: 5px; +font-size: 10px; +text-decoration: none; +} + +#user_links a:hover { +color: #fce94f; +} + + +/* SEARCH BAR */ +#search_bar { +position: absolute; +top: 0px; +width: 380px; +left: 50%; +margin-left: -190px; +height: 20px; +text-align: center; +color: #204a87; +z-index: 9999; +} + +#search_input_bar { +width: 163px; +height: 19px; +font-size: 10px; +border: 1px solid #545454; +} + +#search_select_bar { +height: 18px; +font-size: 10px; +border: 1px solid #545454; +} + +#search_button_bar { +height: 17px; +font-size: 10px; +border: 1px solid #545454; +} + + +/* MENU BAR */ +#menu_bar { +position: absolute; +top: 19px; +width: 380px; +left: 50%; +font-size: 12px; +margin-left: -190px; +height: 20px; +text-align: center; +} + +#menu { +margin: 0px; +padding: 0px; +text-align: center; +list-style:none; +} + +#menu li { +float: left; +font-weight: bold; +position: relative; +} + +#menu li ul { + display:none; + position:absolute; + list-style:none; + text-align: left; + left:0px; + margin:0px; + width: 200px; + padding:0px; +} + +#menu li:hover ul { display:block; } + +#menu li:hover, #menu li a:hover, #menu a:focus { + background: url("../images/bg_blue_menu.png") left bottom repeat-x; + color: #ffffff; +} + +#menu li a{ + display:block; + padding:.2em .5em; + text-decoration:none; + color: #dfdfdf; +} + +#menu li ul{ + background: #bcc6d4; +} + +#menu li ul a{ + color: #204a87; + border: 1px solid transparent; +} + +#menu li ul li { + width: 100%; +} + +#menu li ul li a:hover { + background: url("../images/bg_blue_menu.png") left bottom repeat-x; + color: #ffffff; +} + + +/* Cores Tango +ef2929 - Vermelho Claro +729fcf - Azul Claro +3465a4 - Azul Medio +204a87 - Azul Escuro +fce94f - Amarelo Claro +*/ +/* END MENU BAR */ + diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 33fb102..4cd06cf 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -3,88 +3,6 @@ margin: 0px; padding: 0px; } -#notice { -position: absolute; -margin-top: 10px; -right: 10px; -background: #ffffa9; -padding: 10px; -border: 3px solid #dfdfdf; -z-index: 9999 !important ; +a img { + border: none; } - -/* Bar Blue Default */ - -#virtual_community_identification { -position: absolute !important; -background: url("../images/bg_blue_logo.png") 5px no-repeat !important; -vertical-align: bottom !important ; -width: 230px !important ; -height: 34px !important ; -line-height: 34px !important ; -padding-left: 60px !important ; -} - -#virtual_community_identification:hover { -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 ; -} - -#user_links a:hover, #user_links a:focus, #login_box a:hover, #login_box a:focus, #register_box a:hover, #register_box a:focus { -color: #dfdfdf !important ; -text-decoration: none !important ; -} - -#logout_box a:hover, #logout_box a:focus { -color: red !important ; -text-decoration: none !important ; -} - -#menu_accessibility { - background: #fff url("../images/black_white_12px.png") repeat-x !important ; - font-size: 10px !important ; - color: black !important ; - font-family: Sans-serif !important ; - color: #545454 !important ; -} - -#menu_accessibility a { - color: #545454 !important ; - text-decoration: none !important ; -} - -#menu_accessibility a:hover { - color: #000000 !important ; - text-decoration: underline !important ; -} - -#menu_accessibility a:focus { - color: red !important ; - text-decoration: underline !important ; -} - -- libgit2 0.21.2