app/views/admin/categories/_category.html.haml app/views/admin/categories/_form.html.haml app/views/admin/categories/edit.html.haml app/views/admin/categories/index.html.haml app/views/admin/categories/new.html.haml app/views/admin/categories/show.html.haml app/views/admin/configurations/index.html.haml app/views/admin/forums/_form.html.haml app/views/admin/forums/_forum.html.haml app/views/admin/forums/_forums.html.haml app/views/admin/forums/edit.html.haml app/views/admin/forums/index.html.haml app/views/admin/forums/new.html.haml app/views/admin/groups/_form.html.haml app/views/admin/groups/edit.html.haml app/views/admin/groups/index.html.haml app/views/admin/groups/new.html.haml app/views/admin/index/index.html.haml app/views/admin/ips/index.html.haml app/views/admin/ips/show.html.haml app/views/admin/permissions/_form.html.haml app/views/admin/permissions/edit.html.haml app/views/admin/permissions/index.html.haml app/views/admin/permissions/new.html.haml app/views/admin/posts/index.html.haml app/views/admin/ranks/_form.html.haml app/views/admin/ranks/edit.html.haml app/views/admin/ranks/index.html.haml app/views/admin/ranks/new.html.haml app/views/admin/themes/index.html.haml app/views/admin/topics/index.html.haml app/views/admin/users/ban.html.haml app/views/admin/users/ban_ip.html.haml app/views/admin/users/edit.html.haml app/views/admin/users/index.html.haml app/views/admin/users/show.html.haml app/views/edits/index.html.haml app/views/edits/show.html.haml app/views/forums/_forum.html.haml app/views/forums/index.html.haml app/views/forums/show.html.haml app/views/layouts/admin.html.haml app/views/layouts/application.html.haml app/views/layouts/moderator.html.haml app/views/messages/_message.html.haml app/views/messages/index.html.haml app/views/messages/new.html.haml app/views/messages/reply.html.haml app/views/messages/sent.html.haml app/views/messages/show.html.haml app/views/moderator/index/index.html.haml app/views/moderator/moderations/edit.html.haml app/views/moderator/moderations/index.html.haml app/views/moderator/posts/split.html.haml app/views/moderator/reports/index.html.haml app/views/moderator/topics/merge.html.haml app/views/moderator/topics/move.html.haml app/views/posts/_form.html.haml app/views/posts/_post.html.haml app/views/posts/edit.html.haml app/views/posts/index.html.haml app/views/posts/new.html.haml app/views/reports/new.html.haml app/views/search/index.html.haml app/views/search/user.html.haml app/views/subscriptions/index.html.haml app/views/topics/_buttons.html.haml app/views/topics/_form.html.haml app/views/topics/edit.html.haml app/views/topics/new.html.haml app/views/topics/show.html.haml app/views/users/edit.html.haml app/views/users/index.html.haml app/views/users/ip_is_banned.html.haml app/views/users/login.html.haml app/views/users/logout.html.haml app/views/users/show.html.haml app/views/users/signup.html.haml public/themes/blue/style.sass vendor/plugins/haml/init.rb @@ -61,15 +61,16 @@ module ApplicationHelper end def menu_for_topic + buttons = [] links = [] if logged_in? if current_user.can?(:start_new_topics, @forum) - links << link_to(t(:New, :thing => "Topic"), new_forum_topic_path(@forum), :class => "new_topic_button") + buttons << link_to(t(:New, :thing => "Topic"), new_forum_topic_path(@forum), :class => "new_topic_button") end if (@topic.locked? && current_user.can?(:reply_to_locked_topics)) || (!@topic.locked? && current_user.can?(:reply_to_topics)) && (!@forum.open? && current_user.can?(:post_in_closed_forums) || @forum.open?) - links << link_to(t(:New, :thing => "Reply"), new_topic_post_path(@topic)) + buttons << link_to(t(:New, :thing => "Reply"), new_topic_post_path(@topic)) end if current_user.can?(:lock_topics, @forum) || (current_user.can?(:lock_own_topics, @forum) && @topic.belongs_to?(current_user)) @@ -92,7 +93,7 @@ module ApplicationHelper end end - '<div class="topic_menu">' + links.join(" | ") + '</div>' + '<div><div class="topic_buttons">' + buttons.to_s + ' </div><div class="topic_actions">' + links.join(" | ") + '</div><div class="clear"></div></div>' else if @topic.locked? t(:Locked!) app/helpers/application_helper.rb @@ -63,3 +63,5 @@ require 'class_ext' require 'array_ext' require 'themes_loader' Dir.glob("#{RAILS_ROOT}/lib/rboard/*") { |f| require f } + +Sass::Plugin.options[:template_location] = [[RAILS_ROOT + "/public/themes/blue", RAILS_ROOT + "/public/themes/blue"], [RAILS_ROOT + "/public/themes/dark", RAILS_ROOT + "/public/themes/dark"]] #TODO: enumerate actual public/themes directory contents config/environment.rb @@ -16,6 +16,9 @@ config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false config.action_view.debug_rjs = true +#Sass setting +Proc.new { Sass::Plugin.options[:cache] = false } + # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false config/environments/development.rb @@ -2,43 +2,35 @@ body, textarea, table { font-family: "Trebuchet MS", sans-serif; font-size: 11pt; margin: 0; - padding: 0; -} + padding: 0; } a { color: #48769d; - text-decoration: none; -} + text-decoration: none; } h2 { - margin: 1.5em -} + margin: 1.5em; } h3 { - margin: 0; -} + margin: 0; } img { - border: 0 none; -} + border: 0 none; } .translation_missing { background: #000000; color: red; padding: 5px; - font-weight: bold; -} + font-weight: bold; } .center { - text-align: center; -} + text-align: center; } .title-bar { background-color: #85c7ff; border-top: 1px solid #99daff; border-bottom: 1px solid #4b8ec8; - height: 4em; -} + height: 4em; } h1 { float: right; @@ -48,37 +40,32 @@ h1 { width: 170px; height: 42px; margin: 0; - padding: .3em; -} + padding: .3em; } .menu-bar { color: #6e9ec8; + text-shadow: 0 1px #beebff; background-color: #aad8ff; border-top: 1px solid #beebff; border-bottom: 1px solid #6e9ec8; line-height: 2em; - padding: .1em .8em; -} + padding: .1em .8em; } .search { float: right; - margin-left: .5em; -} - -.search input { - background-color: #5d8bb3; - border: 1px #5d8bb3 solid; - border-top-color: #3a5770; - border-bottom-color: #c2e3ff; -} + margin-left: .5em; } + .search input { + background-color: #5d8bb3; + border: 1px #5d8bb3 solid; + border-top-color: #3a5770; + border-bottom-color: #c2e3ff; } .content { text-align: left; width: 84%; margin: 0 auto; padding: 1em 0; - min-width: 960px; -} + min-width: 960px; } .flash { background: #a4d5ff none repeat scroll 0; @@ -91,49 +78,34 @@ h1 { position: fixed; bottom: 0; left: 0; - width: 100%; -} + width: 100%; } .breadcrumbs { color: #84bef0; - margin-top: .8em; -} - -.breadcrumbs a { - /*color: #ddd;*/ -} + margin-top: .8em; } #moderated_topics_count { - font-size: 9pt; -} + font-size: 9pt; } .pagination { padding: .3em; - font-size: 10pt; -} - -.pagination a, .pagination span { - padding: .1em .2em; -} - -.pagination span.disabled { - color: #bbb; -} -.pagination span.current { - font-weight: bold; - background-color: #bbb; -} -.pagination a { - text-decoration: none; - color: black; -} -.pagination a:hover, .pagination a:focus { - text-decoration: underline; -} + font-size: 10pt; } + .pagination a { + padding: .1em .2em; + text-decoration: none; + color: black; } + .pagination a:hover, .pagination a:focus { + text-decoration: underline; } + .pagination span { + padding: .1em .2em; } + .pagination span.disabled { + color: #bbb; } + .pagination span.current { + font-weight: bold; + background-color: #bbb; } .icon { - width: 80px; -} + width: 80px; } .forums h1 { font-size: 16pt; @@ -145,74 +117,73 @@ h1 { overflow: visible; display: block; width: auto; - height: auto; -} + height: auto; } .category { - padding: 5px; -} + padding: 5px; } .forums, .forum, .info-box, .list-table, .category { - border: 1px solid #84AFD3; -} + border: 1px solid #84AFD3; } .forums td, .forum td, .list-table td { - padding: 5px; -} + padding: 5px; } .forums thead, .forum thead, .info-box thead, .post thead, .action-box thead, .list-table thead { background: #aad8ff none repeat-x scroll 0; - font-weight: bold; -} + font-weight: bold; } .forums tbody td, .list-table tbody td { - background: white; -} + background: white; } .forum tfoot { - background: #C1E2FE none repeat scroll 0; -} + background: #C1E2FE none repeat scroll 0; } + .forum tfoot input { + background: #DBEEFD none repeat scroll 0; + border: 1px solid #48769D; + font-size: 10pt; + letter-spacing: -1px; + margin: 2px; } + +.topic_buttons { + float: left; + display: block; } -.forum tfoot input { - background: #DBEEFD none repeat scroll 0; - border: 1px solid #48769D; - font-size: 10pt; - letter-spacing: -1px; - margin: 2px; -} +.new_topic_button { + display: inline-block; + vertical-align: middle; + text-indent: -99999px; + overflow: hidden; + background: transparent url(new_topic.png) no-repeat center; + width: 151px; + height: 39px; } -.forum { -} +.topic_actions { + float: right; } .topic_menu { color: #6e9ec8; border: 1px solid #84afd3; - background:#e1f1ff; + background: #e1f1ff; margin: .8em 0 1em; padding: .3em; -} + float: right; + display: block; } -.warning { +.warning { background: #fde181; border: 1px solid #fece26; padding: .6em; - font-weight: bold; -} + font-weight: bold; } .action-box, .user { - background:#aad8ff; + background: #aad8ff; border: 1px solid #84afd3; - /*border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px;*/ - margin-bottom: .6em; -} + margin-bottom: .6em; } .post { margin-bottom: 1.5em; border: 1px #84afd3 solid; - background:#e1f1ff; -} + background: #e1f1ff; } .user_info { float: left; @@ -220,23 +191,18 @@ h1 { clear: both; margin: 0; padding: .5em 1%; - text-align: left; -} + text-align: left; } dt { - font-weight: bold; -} + font-weight: bold; } + dt img { + margin-top: .3em; } -dt img { - margin-top: .3em; -} .user_info dd { - margin: 0; -} + margin: 0; } .field_name { - font-weight: bold; -} + font-weight: bold; } .post_body { float: left; @@ -244,71 +210,46 @@ dt img { border-left: 1px #84afd3 solid; min-height: 200px; margin: 0; - padding: .5em 1%; -} + padding: .5em 1%; } .post_info { padding-bottom: .5em; - border-bottom: 1px #84afd3 solid; -} + border-bottom: 1px #84afd3 solid; } .post_details { float: left; width: 50%; - color: #444; -} - -.post_details a { - color: #444; -} + color: #444; } + .post_details a { + color: #444; } .post_actions { float: right; text-align: right; - width: 50%; -} + width: 50%; } .post_content { padding: .5em 0; - clear: both; -} - -.user_signature { -} + clear: both; } .clear { display: block; clear: both; - line-height: 0; -} - -.new_topic_button { - display: inline-block; - vertical-align: middle; - text-indent: -99999px; - overflow: hidden; - background: transparent url(new_topic.png) no-repeat center; - width: 151px; - height: 39px; -} + line-height: 0; } .action-box tbody, .user tbody { - background: #e1f1ff none repeat scroll 0; -} + background: #e1f1ff none repeat scroll 0; } .action-box tfoot { - background: #e1f1ff url(tfoot-bg.jpg) repeat-x scroll 0; -} + background: #e1f1ff url(tfoot-bg.jpg) repeat-x scroll 0; } .posts h1 { margin: 0; - padding: 0; -} + padding: 0; } .edit-note { - color: #4F93CF; - font-size: 9pt; -} + color: #4F93CF; + font-size: 9pt; } .quote { background: #A4D5FF none repeat scroll 0; @@ -316,60 +257,46 @@ dt img { margin: 0 auto; padding: 5px; text-align: left; - width: 90%; -} + width: 90%; } .CodeRay { padding: 0; - border-spacing: 0; -} - -.CodeRay .line_numbers { - width: 40px; - background: #efefef; - padding: 5px; - text-align: center; - border: 1px solid #84AFD3; - border-right: 0; -} - -.CodeRay .code { - background: white; - border: 1px solid #84AFD3; - border-left: 0; - padding: 20px; -} + border-spacing: 0; } + .CodeRay .line_numbers { + width: 40px; + background: #efefef; + padding: 5px; + text-align: center; + border: 1px solid #84AFD3; + border-right: 0; } + .CodeRay .code { + background: white; + border: 1px solid #84AFD3; + border-left: 0; + padding: 20px; } .term { font-family: Monaco, "Courier New", monospace; - font-weight: bold; -} + font-weight: bold; } .ban-box { background: #DE0000 none repeat scroll 0; border: 10px solid red; color: white; - font-size: 48pt; -} + font-size: 48pt; } + .ban-box h1 { + margin: 0; + padding: 0; } -.ban-box h1 { - margin: 0; - padding: 0; -} - -.fieldWithErrors input, .fieldWithErrors textarea { - border-left: 3px solid #cd0000; -} +.fieldWithErrors input, .fieldWithErrors textarea { + border-left: 3px solid #cd0000; } .errorExplanation { - font-size: 10pt; -} + font-size: 10pt; } .info-box td .right { float: right; - text-align: right; -} -/*autocomplete*/ + text-align: right; } .ac_results { background: white; @@ -377,62 +304,43 @@ dt img { margin: 0; border-bottom: 3px solid #84AFD3; border-right: 3px solid #84AFD3; - border-left: 3px solid #84AFD3; -} - -.ac_results ul { - padding: 0; - margin: 0; - list-style-type: none; -} - -.ac_results ul li { - padding: 5px; -} - -.ac_results ul li:hover { - background: #DBF8FF; -} -/* inspired by http://css.maxdesign.com.au/listamatic/horizontal02.htm */ -ul#admin-navlist, ul#moderator-navlist { + border-left: 3px solid #84AFD3; } + .ac_results ul { + padding: 0; + margin: 0; + list-style-type: none; } + .ac_results ul li { + padding: 5px; } + .ac_results ul li:hover { + background: #DBF8FF; } + +ul #admin-navlist, ul #moderator-navlist { margin: 2px 2px 2px 0; padding: 0; - white-space: nowrap; -} - -#admin-navlist li, #moderator-navlist li { - display: inline; - list-style-type: none; -} - -#admin-navlist a, #moderator-navlist a { - padding: 3px 10px; -} - -#admin-navlist a:link, #admin-navlist a:visited, #moderator-navlist a:link, #moderator-navlist a:visited { - color :#336699; - background-color: #b8dcfc; - text-decoration: none; - border: 1px solid #336699; - border-bottom: 0; -} - -#admin-navlist a.selected, #moderator-navlist a.selected { - border: 2px solid #336699; - border-bottom: 0; - font-weight: bold; -} + white-space: nowrap; } + ul #admin-navlist li, ul #moderator-navlist li { + display: inline; + list-style-type: none; } + ul #admin-navlist a, ul #moderator-navlist a { + padding: 3px 10px; } + ul #admin-navlist a:link, ul #admin-navlist a:visited, ul #moderator-navlist a:link, ul #moderator-navlist a:visited { + color: #336699; + background-color: #b8dcfc; + text-decoration: none; + border: 1px solid #336699; + border-bottom: 0; } + ul #admin-navlist a.selected, ul #moderator-navlist a.selected { + border: 2px solid #336699; + border-bottom: 0; + font-weight: bold; } #admin-page, #moderator-page { background: #b8dcfc; padding: 5px; - border: 1px solid #336699; -} + border: 1px solid #336699; } .list-table td { - text-align: center; -} + text-align: center; } -.lalign { - text-align:left !important; -} +.lalign { + text-align: left !important; } public/themes/blue/style.css app/views/admin/categories/_category.html.erb app/views/admin/categories/_form.html.erb app/views/admin/categories/edit.html.erb app/views/admin/categories/index.html.erb app/views/admin/categories/new.html.erb app/views/admin/categories/show.html.erb app/views/admin/configurations/index.html.erb app/views/admin/forums/_form.html.erb app/views/admin/forums/_forum.html.erb app/views/admin/forums/_forums.html.erb app/views/admin/forums/edit.html.erb app/views/admin/forums/index.html.erb app/views/admin/forums/new.html.erb app/views/admin/groups/_form.html.erb app/views/admin/groups/edit.html.erb app/views/admin/groups/index.html.erb app/views/admin/groups/new.html.erb app/views/admin/index/index.html.erb app/views/admin/ips/index.html.erb app/views/admin/ips/show.html.erb app/views/admin/permissions/_form.html.erb app/views/admin/permissions/edit.html.erb app/views/admin/permissions/index.html.erb app/views/admin/permissions/new.html.erb app/views/admin/posts/index.html.erb app/views/admin/ranks/_form.html.erb app/views/admin/ranks/edit.html.erb app/views/admin/ranks/index.html.erb app/views/admin/ranks/new.html.erb app/views/admin/themes/index.html.erb app/views/admin/topics/index.html.erb app/views/admin/users/ban.html.erb app/views/admin/users/ban_ip.html.erb app/views/admin/users/edit.html.erb app/views/admin/users/index.html.erb app/views/admin/users/show.html.erb app/views/edits/index.html.erb app/views/edits/show.html.erb app/views/forums/_forum.html.erb app/views/forums/index.html.erb app/views/forums/show.html.erb app/views/layouts/admin.html.erb app/views/layouts/application.html.erb app/views/layouts/moderator.html.erb app/views/messages/_message.html.erb app/views/messages/index.html.erb app/views/messages/new.html.erb app/views/messages/reply.html.erb app/views/messages/sent.html.erb app/views/messages/show.html.erb app/views/moderator/index/index.html.erb app/views/moderator/moderations/edit.html.erb app/views/moderator/moderations/index.html.erb app/views/moderator/posts/split.html.erb app/views/moderator/reports/index.html.erb app/views/moderator/topics/merge.html.erb app/views/moderator/topics/move.html.erb app/views/posts/_form.html.erb app/views/posts/_post.html.erb app/views/posts/edit.html.erb app/views/posts/index.html.erb app/views/posts/new.html.erb app/views/reports/new.html.erb app/views/search/index.html.erb app/views/search/user.html.erb app/views/subscriptions/index.html.erb app/views/topics/_buttons.html.erb app/views/topics/_form.html.erb app/views/topics/edit.html.erb app/views/topics/new.html.erb app/views/topics/show.html.erb app/views/users/edit.html.erb app/views/users/index.html.erb app/views/users/ip_is_banned.html.erb app/views/users/login.html.erb app/views/users/logout.html.erb app/views/users/show.html.erb app/views/users/signup.html.erb 0bc8fd3881afd6326800b4961a18d3ee35ce1430 CvX cvx@cvx-VMdesktop-ubuntu.(none) http://github.com/radar/rboard/commit/41e9f5bcf7e9ef9d499dc1a3eac1d240904967f5 41e9f5bcf7e9ef9d499dc1a3eac1d240904967f5 2009-11-10T15:15:48-08:00 2009-11-10T15:15:48-08:00 Conversion from html/css to haml/sass e3bad1ddbf4538463da4f6a88768201e305bd376 CvX cvx@cvx-VMdesktop-ubuntu.(none)