diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 834836a..87cb7b0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -91,7 +91,7 @@ module ApplicationHelper # TODO: test this helper def user_links links = [ - ( link_to(_('My accont'), { :controller => 'account' }) ), + ( link_to(_('My account'), { :controller => 'account' }) ), ( link_to_profile(_('My home page')) ), ( link_to_cms(_('Manage content')) ), ( link_to (_('Manage layout')), :controller => 'edit_template' ), diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index 2e5af71..20d35ae 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -32,7 +32,10 @@ <% end %>
- + +
+ +
<% if params[:controller] == 'comatose_admin' %> <%= yield %> <% else %> diff --git a/public/designs/templates/default/default.yml b/public/designs/templates/default/default.yml index 9dece24..70dfdc8 100644 --- a/public/designs/templates/default/default.yml +++ b/public/designs/templates/default/default.yml @@ -1,2 +1,3 @@ -title: "3 columns" +title: "Blue Style 3 columns" +description: "A theme blue with 3 columns" number_of_boxes: 3 diff --git a/public/designs/templates/default/images/bg_bgheader.png b/public/designs/templates/default/images/bg_bgheader.png new file mode 100644 index 0000000..045325a Binary files /dev/null and b/public/designs/templates/default/images/bg_bgheader.png differ diff --git a/public/designs/templates/default/images/bg_content.png b/public/designs/templates/default/images/bg_content.png new file mode 100644 index 0000000..ae4d548 Binary files /dev/null and b/public/designs/templates/default/images/bg_content.png differ diff --git a/public/designs/templates/default/images/bg_footer.png b/public/designs/templates/default/images/bg_footer.png new file mode 100644 index 0000000..a7ea6b1 Binary files /dev/null and b/public/designs/templates/default/images/bg_footer.png differ diff --git a/public/designs/templates/default/images/bg_header.png b/public/designs/templates/default/images/bg_header.png new file mode 100644 index 0000000..2d96afd Binary files /dev/null and b/public/designs/templates/default/images/bg_header.png differ diff --git a/public/designs/templates/default/source/bluestyle.png b/public/designs/templates/default/source/bluestyle.png new file mode 100644 index 0000000..9c188b6 Binary files /dev/null and b/public/designs/templates/default/source/bluestyle.png differ diff --git a/public/designs/templates/default/source/bluestyle.svg b/public/designs/templates/default/source/bluestyle.svg new file mode 100644 index 0000000..2395494 --- /dev/null +++ b/public/designs/templates/default/source/bluestyle.svg @@ -0,0 +1,383 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Barra de Ferramentas + + + + + + + + + + Itens para Adicionar + + + + diff --git a/public/designs/templates/default/source/tmpimg.png b/public/designs/templates/default/source/tmpimg.png new file mode 100644 index 0000000..fdae50d Binary files /dev/null and b/public/designs/templates/default/source/tmpimg.png differ diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index b084e7a..16a97ee 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -1,124 +1,115 @@ -body, td, tr, li { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; -} body { - margin: 0px; -} -blockquote { - font-style: italic; - color: #444; +margin: 0px; +padding: 0px; +font-family: Verdana, Sans-Serif; +font-size: 14px; } -blockquote, p, li, td, tr { - text-align: justify; -} -p { - text-indent: 2em; -} -blockquote p { - text-indent: 0px; +#frame { +background: #FFF url("../images/bg_content.png") top center repeat-y; } -#spinner { - z-index: 1000; - position: absolute; - left: 50%; - margin-left: -16px; - top: 200px; +#content { +background: url("../images/bg_bgheader.png") top left repeat-x; } -#header { - border-bottom: 1px solid black; - padding: 0.5em; +#header_content { +background: url("../images/bg_header.png") top center no-repeat; +height: 135px; } -#menu { - float: right; - margin-right: 1em; - margin-top: 1em; +#boxes { +position: relative; +width: 800px; +left: 50%; +margin-left: -400px; } -#content { - padding: 0px; +#box_3 { +width: 200px; +float: right; } -#footer { - clear: both; - text-align: center; - border-top: 1px solid black; +#box_2 { +float: left; +width: 200px; } -#notice, #errorExplanation { - border: 1px solid black; - margin-top: 1em; - margin-left: 30%; - margin-right: 30%; - padding: 0.5em; +#box_1 { +margin-left: 205px; +margin-right: 205px; } -#boxes { - position: relative; - padding: 1em; -/* border: 1px solid red; */ +#spinner { + z-index: 1000; + position: absolute; + left: 50%; + margin-left: -16px; + top: 200px; } -ul.block_list { -margin: 0; -padding: 0; +#footer { +margin: 0px; +padding: 5px; +text-align: center; +clear: both; +background: #c5d0df url("../images/bg_footer.png") top left repeat-x; } -ul.block_list li { + +/* Edition Mode */ + +#design_editor .block_list { list-style: none; +margin: 0px; +padding: 3px; } -/* Box 1 is the main area */ -#box_1 { - margin-right: 220px; - margin-left: 220px; - /* border: 1px solid yellow; */ +#design_editor .box { +border: 2px solid transparent; } -/* Box 2 on the left side */ -#box_2 { - float: left; - /* border: 1px solid blue; */ - width: 200px; - padding: 0px; +#design_editor .hover { +border: 2px dotted red; +background: #ff6; } -/* Box 3 on the right side */ -#box_3 { - /* border: 1px solid green; */ - width: 200px; - float: right; - padding: 0px; +#design_editor_toolbar { +padding: 5px; } -#design_editor_toolbar { - padding: 0.5em; +#design_editor_toolbar h3 { +font-size: 10px; +background: #dfdfdf; +margin: 0px; +padding: 1px; +text-align: right; +color: #545454; } -#design_editor_toolbar h3 { - margin-top: 0px; - margin-bottom: 0.5em; +#design_editor_toolbar a { +font-size: 10px; +padding: 5px; +background: #dfdfdf; +color: black; } -#design_editor .box { - border: 2px dashed gray; - padding: 2px; +.design_editor_box_toolbar { +text-align: center; +margin: 5px; +background: #dfdfdf; } -#design_editor .hover { - background: #ff6; - border: 2px solid black; +.design_editor_box_toolbar a { +display: inline; +width: 30px; +font-size: 10px; +padding: 2px; +background: #dfdfdf; } -#design_editor_toolbar { - border: 1px solid black; - margin-bottom: 0.5em; +#design_editor_toolbar a:hover, .design_editor_box_toolbar a:hover { +background: #545454; +color: #ffffff; } -.design_editor_box_toolbar { - padding: 0.5em; -} diff --git a/public/designs/templates/default/thumbnail.png b/public/designs/templates/default/thumbnail.png index 9cd3f3a..a9332f5 100644 Binary files a/public/designs/templates/default/thumbnail.png and b/public/designs/templates/default/thumbnail.png differ diff --git a/public/designs/templates/leftbar/leftbar.yml b/public/designs/templates/leftbar/leftbar.yml new file mode 100644 index 0000000..66ca237 --- /dev/null +++ b/public/designs/templates/leftbar/leftbar.yml @@ -0,0 +1,3 @@ +title: "LeftBar 2 columns" +description: "A theme with 2 columns" +number_of_boxes: 2 diff --git a/public/designs/templates/leftbar/source/bluestyle.png b/public/designs/templates/leftbar/source/bluestyle.png new file mode 100644 index 0000000..9c188b6 Binary files /dev/null and b/public/designs/templates/leftbar/source/bluestyle.png differ diff --git a/public/designs/templates/leftbar/source/bluestyle.svg b/public/designs/templates/leftbar/source/bluestyle.svg new file mode 100644 index 0000000..def5aee --- /dev/null +++ b/public/designs/templates/leftbar/source/bluestyle.svg @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + Barra de Ferramentas + + + + + + + + + + Itens para Adicionar + + + diff --git a/public/designs/templates/leftbar/source/tmpimg.png b/public/designs/templates/leftbar/source/tmpimg.png new file mode 100644 index 0000000..fdae50d Binary files /dev/null and b/public/designs/templates/leftbar/source/tmpimg.png differ diff --git a/public/designs/templates/leftbar/thumbnail.png b/public/designs/templates/leftbar/thumbnail.png new file mode 100644 index 0000000..a2f4d3c Binary files /dev/null and b/public/designs/templates/leftbar/thumbnail.png differ diff --git a/public/designs/templates/old_default/default.yml b/public/designs/templates/old_default/default.yml new file mode 100644 index 0000000..9dece24 --- /dev/null +++ b/public/designs/templates/old_default/default.yml @@ -0,0 +1,2 @@ +title: "3 columns" +number_of_boxes: 3 diff --git a/public/designs/templates/old_default/stylesheets/style.css b/public/designs/templates/old_default/stylesheets/style.css new file mode 100644 index 0000000..b084e7a --- /dev/null +++ b/public/designs/templates/old_default/stylesheets/style.css @@ -0,0 +1,124 @@ +body, td, tr, li { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; +} +body { + margin: 0px; +} +blockquote { + font-style: italic; + color: #444; +} + +blockquote, p, li, td, tr { + text-align: justify; +} +p { + text-indent: 2em; +} +blockquote p { + text-indent: 0px; +} + +#spinner { + z-index: 1000; + position: absolute; + left: 50%; + margin-left: -16px; + top: 200px; +} + +#header { + border-bottom: 1px solid black; + padding: 0.5em; +} + +#menu { + float: right; + margin-right: 1em; + margin-top: 1em; +} + +#content { + padding: 0px; +} + +#footer { + clear: both; + text-align: center; + border-top: 1px solid black; +} + +#notice, #errorExplanation { + border: 1px solid black; + margin-top: 1em; + margin-left: 30%; + margin-right: 30%; + padding: 0.5em; +} + +#boxes { + position: relative; + padding: 1em; +/* border: 1px solid red; */ +} + +ul.block_list { +margin: 0; +padding: 0; +} + +ul.block_list li { +list-style: none; +} + +/* Box 1 is the main area */ +#box_1 { + margin-right: 220px; + margin-left: 220px; + /* border: 1px solid yellow; */ +} + +/* Box 2 on the left side */ +#box_2 { + float: left; + /* border: 1px solid blue; */ + width: 200px; + padding: 0px; +} + +/* Box 3 on the right side */ +#box_3 { + /* border: 1px solid green; */ + width: 200px; + float: right; + padding: 0px; +} + +#design_editor_toolbar { + padding: 0.5em; +} + +#design_editor_toolbar h3 { + margin-top: 0px; + margin-bottom: 0.5em; +} + +#design_editor .box { + border: 2px dashed gray; + padding: 2px; +} + +#design_editor .hover { + background: #ff6; + border: 2px solid black; +} + +#design_editor_toolbar { + border: 1px solid black; + margin-bottom: 0.5em; +} + +.design_editor_box_toolbar { + padding: 0.5em; +} diff --git a/public/designs/templates/old_default/thumbnail.png b/public/designs/templates/old_default/thumbnail.png new file mode 100644 index 0000000..9cd3f3a Binary files /dev/null and b/public/designs/templates/old_default/thumbnail.png differ diff --git a/public/designs/themes/default/default.css b/public/designs/themes/default/default.css index 67a8f67..a824547 100644 --- a/public/designs/themes/default/default.css +++ b/public/designs/themes/default/default.css @@ -1,24 +1,77 @@ -@import "blocks.css"; +/* Default Plain Theme for Blocks */ -#frame { - background-color: white; +div.block +{ + background: #FFFFFF; + border: 3px solid #000000; + margin-bottom: 10px; } -a img { - border: 2px solid transparent; +div.block ul +{ + list-style: none; + margin-left: 15px; } -a:hover img { - border: 2px solid #aa0; + +div.block h3 +{ + color: #FFFFFF; + background: #545454; + font-family: Sans-serif; + font-size: 13px; + font-weight: normal; + border-bottom: 1px solid black; + height: 27px; + margin: 0px; + line-height: 27px; + padding-left: 10px; +} + +div.block span { +display: none; +} + +div.block a:hover span { +display: inline; +position: absolute; +color: #dfdfdf; +background: #000000; +font-family: Sans-serif; +font-size: 13px; +font-weight: normal; +margin: 10px; +padding-left: 5px; +padding-right: 5px; +} + +div.block a { +display: block; +width: 10px; +height: 10px; +margin-top: 10px; +margin-right: 5px; +float: right; } -table { - border-collapse: collapse; +div.block a.button_block_hide { +border-bottom: 2px solid #dfdfdf; } -td, th { - border: 1px solid gray; +div.block a:hover.button_block_hide { +border-bottom: 2px solid #000000; } -th { - background: gray; +div.block a.button_block_remove { +background: #dfdfdf; } + +div.block a:hover.button_block_remove { +background: #000000; +} + +div.block_content +{ + padding: 5px; +} + + diff --git a/public/designs/themes/default/thumbnail.png b/public/designs/themes/default/thumbnail.png index 91a792a..b55e9f4 100644 Binary files a/public/designs/themes/default/thumbnail.png and b/public/designs/themes/default/thumbnail.png differ diff --git a/public/designs/themes/green/green.css b/public/designs/themes/green/green.css index 40a8c17..a833ce3 100644 --- a/public/designs/themes/green/green.css +++ b/public/designs/themes/green/green.css @@ -1 +1,77 @@ -/* empty */ +/* Green Theme for Blocks */ + +div.block +{ + background: #FFFFFF; + border: 3px solid #060; + margin-bottom: 10px; +} + +div.block ul +{ + list-style: none; + margin-left: 15px; +} + +div.block h3 +{ + color: #afa; + background: green; + font-family: Sans-serif; + font-size: 13px; + font-weight: normal; + border-bottom: 1px solid black; + height: 27px; + margin: 0px; + line-height: 27px; + padding-left: 10px; +} + +div.block span { +display: none; +} + +div.block a:hover span { +display: inline; +position: absolute; +color: white; +background: #009900; +font-family: Sans-serif; +font-size: 13px; +font-weight: normal; +margin: 10px; +padding-left: 5px; +padding-right: 5px; +} + +div.block a { +display: block; +width: 10px; +height: 10px; +margin-top: 10px; +margin-right: 5px; +float: right; +} + +div.block a.button_block_hide { +border-bottom: 2px solid #dfdfdf; +} + +div.block a:hover.button_block_hide { +border-bottom: 2px solid #000000; +} + +div.block a.button_block_remove { +background: #dfdfdf; +} + +div.block a:hover.button_block_remove { +background: #000000; +} + +div.block_content +{ + padding: 5px; +} + + diff --git a/public/designs/themes/green/thumbnail.png b/public/designs/themes/green/thumbnail.png index 91a792a..35ab66a 100644 Binary files a/public/designs/themes/green/thumbnail.png and b/public/designs/themes/green/thumbnail.png differ -- libgit2 0.21.2