Skip to content
This repository
Browse code

Updated 500 page, made minor view & style changes

  • Loading branch information...
commit 1fe30d4aeb64011209a627224e6a982e99600ad2 1 parent a750529
Hulihan Applications authored
29 app/assets/stylesheets/application.css.scss
@@ -17,7 +17,11 @@
17 17
18 18
19 19 /* SASS Vars */
20   -
  20 +$default-box-shadow-color: #000;
  21 +$default-box-shadow-v-offset: 1px;
  22 +$default-box-shadow-blur: 1px;
  23 +$default-text-shadow-color: #000;
  24 +$default-text-shadow-v-offset: 2px;
21 25
22 26 /* Icon Sprites */
23 27 @import "icons/*.png";
@@ -52,13 +56,20 @@ img.small, img.medium {height:50px;border:1px solid #666}
52 56 img.loading {margin:2px;background:#ccc;padding:5px;border:1px solid #666;;@include border-radius;}
53 57
54 58 /* Icons */
55   -
56 59 span.icon-wrapper {
  60 + display:inline-block;
57 61 position:relative;
58   - top:4px;
59   - .icon {width:16px;height:16px;display:inline-block;}
  62 + width:16px;
  63 + height:16px;
  64 + .icon {
  65 + width:16px;
  66 + height:16px;
  67 + display:inline-block;
  68 + position:absolute;
  69 + top:3px;
  70 + }
60 71 }
61   -span.icon-wrapper-spacer {left:5px;}
  72 +span.icon-wrapper-spacer {}
62 73
63 74 /* Cursors */
64 75 .pointer {cursor:pointer;}
@@ -170,12 +181,14 @@ div.fg-menu-container {-moz-border-radius-topleft:0px;-webkit-border-top-left-ra
170 181 ul.fg-menu li a:hover {background:#fff};
171 182
172 183 /* Boxes */
173   -.box_1 {border:1px solid #aaa;background:#E9E9E9;padding:5px;@include border-radius;margin-bottom:10px;}
174   - .box_1 hr, .box_1 div.spacer {width: 100%; margin: 5px 0px 5px 0px; height: 1px; background: #ccc; border: 0; }
  184 +.box_1, .extra_options_box {border:1px solid #aaa;background:#E9E9E9;padding:5px;@include border-radius;margin-bottom:10px;
  185 + hr, div.spacer {
  186 + width: 100%; margin: 5px 0px 5px 0px; height: 1px; background: #ccc; border: 0;
  187 + }
  188 +}
175 189 .box_2, div.logs div.log, div#blog-post, div#side > div {border:1px solid #ccc;background:url(bgs/white_trans_50.png) repeat;padding:5px;@include border-radius;margin-bottom:10px;}
176 190 .hover .box_2 {border:1px solid #999}
177 191 .box_3 {background:url(bgs/white_trans_50.png) repeat;border:1px solid #ccc;;padding:10px;text-align:center;;@include border-radius;margin-right:0px;margin-bottom:10px;}
178   -.extra_options_box {padding:10px;}
179 192
180 193 /* Plugins */
181 194 .plugins {}
3  app/assets/stylesheets/layout.css.scss
@@ -53,13 +53,14 @@ ul.main_menu {
53 53 background:none;;bottom:-20px;left:-1px;
54 54 li {
55 55 padding:5px 8px;margin:0;border:1px solid #ccc;border-top:none;clear:both;
  56 + background:#eee;
56 57 &:hover {background:#fff;@include border-radius(0px);border-top:0px;}
57 58 &:last-child {@include border-radius(0px 0px 5px 5px);}
58 59 a {padding:0;margin:0;background:none;text-align:left;font-size:16px;}
59 60 }
60 61 }
61 62 &.with-subpages{
62   - > a {background:url(icons/expand.png) no-repeat right 5px;padding-right:23px;}
  63 + > a {background:url(icons/expand.png) no-repeat right 5px;padding-right:25px;}
63 64 }
64 65 }
65 66 }
80 app/assets/stylesheets/menu.css.scss
@@ -22,29 +22,67 @@ ul.left li {float:left}
22 22 ul.sortable li ul.sortable li {;padding:0px 0px 0px 20px;}
23 23
24 24 /* Menus */
25   -div.menu {text-align:left;position:relative;}
26   - div.menu .last {margin-bottom:0px}
27   - div.menu ul.left, .record_menu.left {position:absolute;left:0}
28   - div.menu ul.left li,.record_menu.left li {margin-right:2px;}
29   - div.menu ul.right, .record_menu.right, div.header ul.menu {position:absolute;right:0}
30   - div.menu ul.right li, .record_menu.right li, div.header ul.menu li {margin-left:2px;}
31   -div#side div.menu div.footer {text-align:center}
  25 +div.menu, div.record_menu{
  26 + text-align:left;position:relative;
  27 + .last {margin-bottom:0px}
  28 + ul {
  29 + &.left {
  30 + position:absolute;
  31 + left:0;
  32 + li {margin-right:2px}
  33 + }
  34 + &.right {
  35 + position:absolute;right:0;
  36 + li {
  37 + margin-left:2px;
  38 + }
  39 + }
  40 + li {
  41 + span.icon-wrapper {
  42 + // width:16px;
  43 + span.icon {
  44 + // position:absolute;
  45 + }
  46 + }
  47 + }
  48 + }
  49 +}
  50 +
  51 +div.header ul.menu {
  52 + position:absolute;right:0;
  53 + li {
  54 + margin-left:2px;
  55 + }
  56 +}
  57 +
32 58
33   -/* Side Menus */
34 59 div#side ul.menu li span.count, div#side div.menu, div#side ul.menu li a.selected {-moz-border-radius: 5px;-webkit-border-radius: 5px;}
35   -div#side div.menu {}
36   - div#side ul.menu {}
37   - div#side ul.menu li {font-size:16px;position:relative;margin:0;padding:0;}
38   - div#side ul.menu img.icon {/*display:none;*/}
39   - div#side ul.menu li ul {padding:0;margin:0;display:none;}
40   - div#side ul.menu li ul li {font-size:14px;padding:0px 0px 0px 12px;}
41   - div#side ul.menu li > a {display:block;padding:3px 5px;margin-bottom:3px;display:relative;}
42   - div#side ul.menu li > a.selected {;border:1px solid #ccc;background:#fff;box-shadow: 0px 1px 2px #222;;-moz-box-shadow: 0px 1px 2px #222;; -webkit-box-shadow: 0px 1px 2px #222;}
43   - div#side ul.menu li > a.selected > span.count {background:none;border:none;right:7px;top:3px;}
44   - div#side ul.menu li a span.count {position:absolute;top:0;right:6px;text-align:center;background:#fff;border:1px solid #ccc;padding:3px;font-size:10px;;display:block;min-width:15px;}
45   - div#side ul.menu li.selected {;/*border:1px solid #ccc;background:#fff*/}
46   - div#side ul.menu li.selected > ul, div#side ul.menu li.selected > div.menu ul {display:block;}
47   -div#side div.menu div.footer {border-top:1px solid #aaa;padding-top:5px;margin-top:5px;}
  60 +div#side div.menu {
  61 + ul.menu {
  62 + li {
  63 + font-size:16px;position:relative;margin:0;padding:0;
  64 + ul {
  65 + padding:0;margin:0;display:none;
  66 + li {font-size:14px;padding:0px 0px 0px 12px;}
  67 + }
  68 + > ul {display:block;}
  69 + > a {
  70 + display:block;padding:3px 5px;margin-bottom:3px;display:relative;
  71 + &.selected {
  72 + border:1px solid #ccc;background:#fff;box-shadow: 0px 1px 2px #222;;-moz-box-shadow: 0px 1px 2px #222;; -webkit-box-shadow: 0px 1px 2px #222;
  73 + > span.count {background:none;border:none;right:7px;top:3px;}
  74 + }
  75 + span.count {
  76 + position:absolute;top:0;right:6px;text-align:center;background:#fff;border:1px solid #ccc;padding:3px;font-size:10px;;display:block;min-width:15px;
  77 + }
  78 + }
  79 + }
  80 + }
  81 + div.footer {
  82 + border-top:1px solid #aaa;padding-top:5px;margin-top:5px;
  83 + }
  84 +}
  85 +div#side ul.menu li.selected > ul, div#side ul.menu li.selected > div.menu ul {display:block;}
48 86
49 87
50 88 /* Record Menus */
2  app/helpers/categories_helper.rb
@@ -30,7 +30,7 @@ def descend_category(category, options = {}) # recursive print out category
30 30 end
31 31
32 32 if options[:admin_controls] # show admin controls
33   - html += "<td align=right class=\"icon_column\"><img src=\"/themes/#{@setting[:theme]}/images/icons/help.png\" class=\"icon help\" title=\"#{category.description}\"></td>" if category.description && category.description != ""
  33 + html += "<td align=right class=\"icon_column\">#{icon(:help, category.description, "help")}</td>" if category.description && category.description != ""
34 34 html += "<td align=right class=\"icon_column\">" + link_to(icon("new", "#{t("label.item_new_child", :item => Page.model_name.human)}"), {:action => "new", :controller => "categories", :id => category}, :class => "transparent") + "</td>"
35 35 html += "<td align=right class=\"icon_column\">" + link_to(icon("edit"), {:action => "edit", :controller => "categories", :id => category}, :class => "transparent") + "</td>"
36 36 html += "<td align=right class=\"icon_column\">" + link_to(icon("delete"), {:action => "delete", :controller => "categories", :id => category}, :confirm => "Are you sure you want to delete this category? All #{Item.model_name.human(:count => :other)} in this category will be also be deleted.", :class => "transparent") + "</td>"
6 app/helpers/users_helper.rb
@@ -8,7 +8,7 @@ def user_avatar(user, options = {})
8 8 avatar_image(user, options)
9 9 end
10 10 else # user doesn't exist
11   - return raw "<img src=\"/themes/#{@setting[:theme]}/images/icons/failure.png\" class=\"icon\" title=\"#{t("notice.item_not_found", :item => User.model_name.human)}\">"
  11 + return icon(:failure, "#{t("notice.item_not_found", :item => User.model_name.human)}")
12 12 end
13 13 end
14 14
@@ -19,10 +19,10 @@ def avatar_image(user, options = {})
19 19 if user.avatar.blank? ? false : File.exists?(user.avatar.path)
20 20 return image_tag(user.avatar.url, options)
21 21 else # get default avatar
22   - return theme_image_tag("default_avatar.png", options)
  22 + return image_tag("default_avatar.png", options)
23 23 end
24 24 else
25   - return theme_image_tag("default_avatar.png", options)
  25 + return image_tag("default_avatar.png", options)
26 26 end
27 27 end
28 28
1  app/views/application/_head.html.erb
@@ -6,7 +6,6 @@
6 6
7 7 <!-- Load Theme Files -->
8 8 <%= stylesheet_link_tag "/themes/#{@setting[:theme]}/stylesheets/application.css" %>
9   -<%= javascript_include_tag "/themes/#{@setting[:theme]}/javascripts/application.js" %>
10 9 <link rel="shortcut icon" href="/themes/<%= @setting[:theme] %>/images/favicon.ico">
11 10
12 11 <!-- Load Meta Data -->
21 app/views/categories/_form.html.erb
@@ -2,21 +2,18 @@
2 2 <% content_for :side do %>
3 3 <div class="box_2">
4 4 <h2 class="title">
5   - <img src="/themes/<%= @setting[:theme] %>/images/icons/categories.png" class="icon" >
  5 + <%= icon(:categories) %>
6 6 <%= f.label :category_id %>
7 7 </h2>
8 8 <%= category_select_tag("category[category_id]", category.category_id, :id_to_ignore => category.id, :include_blank => true) %>
9 9 </div>
10 10 <% end %>
  11 +<%= content_tag :div, :class => :field do %>
  12 + <%= content_tag :div, f.label(:name), :class => :label %>
  13 + <%= f.text_field :name %>
  14 +<% end %>
11 15
12   - <table cellpadding=1 cellspacing=1>
13   - <tr>
14   - <td><b><%= f.label :name %></b></td>
15   - <td><%= f.text_field :name %></td>
16   - </tr>
17   - <tr>
18   - <td><b><%= f.label :description %></b></td>
19   - <td><%= f.text_field :description %><!--<input name="category[description]" type="text" id="category_description_<%= category.id %>" onfocus = "focus_input('category_description_<%= category.id %>')" onblur = "blur_input('category_description_<%= category.id %>')" maxlength=255 value="<%= category.description %>" size=50>--></td>
20   - </tr>
21   - </table>
22   -<div style="clear:both"></div>
  16 +<%= content_tag :div, :class => :field do %>
  17 + <%= content_tag :div, f.label(:description), :class => :label %>
  18 + <%= f.text_field :description %>
  19 +<% end %>
2  app/views/items/_preview_not_found.html.erb
... ... @@ -1,5 +1,5 @@
1 1 <% if options[:size].to_s == "pinky" %>
2   - <%= link_to(theme_image_tag("icons/preview.png", :title => item.description, :class => options[:size].to_s), {:action => "view", :controller => "items", :id => item}, :title => item.name) %>
  2 + <%= link_to(image_tag("icons/preview.png", :title => item.description, :class => options[:size].to_s), {:action => "view", :controller => "items", :id => item}, :title => item.name) %>
3 3 <% else %>
4 4 <%= content_tag :div, :class => "preview_not_found preview_not_found_#{options[:size].to_s} preview_text" do %>
5 5 <%= link_to(content_tag(:h2, I18n.t("notice.item_not_found", :item => I18n.t("single.preview"))), {:action => "view", :controller => "items", :id => item}, :title => item.name) %>
2  app/views/plugin_videos/_preview.html.erb
@@ -6,4 +6,4 @@
6 6 });
7 7 </script>
8 8
9   -<%= link_to(theme_image_tag("preview_video.png", :class => options[:size]), {:action => "show", :controller => "plugin_videos", :record_id => record.id, :record_type => record.class.name}, :id => link_id, :title => record.title.blank? ? record.title : "") %>
  9 +<%= link_to(image_tag("preview_video.png", :class => options[:size]), {:action => "show", :controller => "plugin_videos", :record_id => record.id, :record_type => record.class.name}, :id => link_id, :title => record.title.blank? ? record.title : "") %>
4 app/views/settings/_setting.html.erb
@@ -12,9 +12,9 @@
12 12 <% when "string" %>
13 13 <% when "bool" %>
14 14 <%= radio_button_tag "setting[#{setting.name}]", "1", setting.to_bool %>
15   - <%= t("single.positive") %>
  15 + <%= label_tag "setting_#{setting.name}_1", t("single.positive") %>
16 16 <%= radio_button_tag "setting[#{setting.name}]", "0", !setting.to_bool %>
17   - <%= t("single.negative") %>
  17 + <%= label_tag "setting_#{setting.name}_0", t("single.negative") %>
18 18 <% when "option" %>
19 19 <select name="setting[<%= setting.name %>]">
20 20 <% for option in setting.options.split(",") %>
2  public/500.html
... ... @@ -1,4 +1,4 @@
1   -<h1>Ahh!</h1>
  1 +<h1>Internal Server Error</h1>
2 2 <h3>This application has encountered an Internal Server Error. This is not good.</h3>
3 3 <br>
4 4 <i>Code: <b>500</b></i>

0 comments on commit 1fe30d4

Please sign in to comment.
Something went wrong with that request. Please try again.