Skip to content

Commit

Permalink
Updated 500 page, made minor view & style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@hulihanapplications
hulihanapplications committed May 22, 2012
1 parent a750529 commit 1fe30d4
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 52 deletions.
29 changes: 21 additions & 8 deletions app/assets/stylesheets/application.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@


/* SASS Vars */

$default-box-shadow-color: #000;
$default-box-shadow-v-offset: 1px;
$default-box-shadow-blur: 1px;
$default-text-shadow-color: #000;
$default-text-shadow-v-offset: 2px;

/* Icon Sprites */
@import "icons/*.png";
Expand Down Expand Up @@ -52,13 +56,20 @@ img.small, img.medium {height:50px;border:1px solid #666}
img.loading {margin:2px;background:#ccc;padding:5px;border:1px solid #666;;@include border-radius;}

/* Icons */

span.icon-wrapper {
display:inline-block;
position:relative;
top:4px;
.icon {width:16px;height:16px;display:inline-block;}
width:16px;
height:16px;
.icon {
width:16px;
height:16px;
display:inline-block;
position:absolute;
top:3px;
}
}
span.icon-wrapper-spacer {left:5px;}
span.icon-wrapper-spacer {}

/* Cursors */
.pointer {cursor:pointer;}
Expand Down Expand Up @@ -170,12 +181,14 @@ div.fg-menu-container {-moz-border-radius-topleft:0px;-webkit-border-top-left-ra
ul.fg-menu li a:hover {background:#fff};

/* Boxes */
.box_1 {border:1px solid #aaa;background:#E9E9E9;padding:5px;@include border-radius;margin-bottom:10px;}
.box_1 hr, .box_1 div.spacer {width: 100%; margin: 5px 0px 5px 0px; height: 1px; background: #ccc; border: 0; }
.box_1, .extra_options_box {border:1px solid #aaa;background:#E9E9E9;padding:5px;@include border-radius;margin-bottom:10px;
hr, div.spacer {
width: 100%; margin: 5px 0px 5px 0px; height: 1px; background: #ccc; border: 0;
}
}
.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;}
.hover .box_2 {border:1px solid #999}
.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;}
.extra_options_box {padding:10px;}

/* Plugins */
.plugins {}
Expand Down
3 changes: 2 additions & 1 deletion app/assets/stylesheets/layout.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,14 @@ ul.main_menu {
background:none;;bottom:-20px;left:-1px;
li {
padding:5px 8px;margin:0;border:1px solid #ccc;border-top:none;clear:both;
background:#eee;
&:hover {background:#fff;@include border-radius(0px);border-top:0px;}
&:last-child {@include border-radius(0px 0px 5px 5px);}
a {padding:0;margin:0;background:none;text-align:left;font-size:16px;}
}
}
&.with-subpages{
> a {background:url(icons/expand.png) no-repeat right 5px;padding-right:23px;}
> a {background:url(icons/expand.png) no-repeat right 5px;padding-right:25px;}
}
}
}
Expand Down
80 changes: 59 additions & 21 deletions app/assets/stylesheets/menu.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,67 @@ ul.left li {float:left}
ul.sortable li ul.sortable li {;padding:0px 0px 0px 20px;}

/* Menus */
div.menu {text-align:left;position:relative;}
div.menu .last {margin-bottom:0px}
div.menu ul.left, .record_menu.left {position:absolute;left:0}
div.menu ul.left li,.record_menu.left li {margin-right:2px;}
div.menu ul.right, .record_menu.right, div.header ul.menu {position:absolute;right:0}
div.menu ul.right li, .record_menu.right li, div.header ul.menu li {margin-left:2px;}
div#side div.menu div.footer {text-align:center}
div.menu, div.record_menu{
text-align:left;position:relative;
.last {margin-bottom:0px}
ul {
&.left {
position:absolute;
left:0;
li {margin-right:2px}
}
&.right {
position:absolute;right:0;
li {
margin-left:2px;
}
}
li {
span.icon-wrapper {
// width:16px;
span.icon {
// position:absolute;
}
}
}
}
}

div.header ul.menu {
position:absolute;right:0;
li {
margin-left:2px;
}
}


/* Side Menus */
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;}
div#side div.menu {}
div#side ul.menu {}
div#side ul.menu li {font-size:16px;position:relative;margin:0;padding:0;}
div#side ul.menu img.icon {/*display:none;*/}
div#side ul.menu li ul {padding:0;margin:0;display:none;}
div#side ul.menu li ul li {font-size:14px;padding:0px 0px 0px 12px;}
div#side ul.menu li > a {display:block;padding:3px 5px;margin-bottom:3px;display:relative;}
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;}
div#side ul.menu li > a.selected > span.count {background:none;border:none;right:7px;top:3px;}
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;}
div#side ul.menu li.selected {;/*border:1px solid #ccc;background:#fff*/}
div#side ul.menu li.selected > ul, div#side ul.menu li.selected > div.menu ul {display:block;}
div#side div.menu div.footer {border-top:1px solid #aaa;padding-top:5px;margin-top:5px;}
div#side div.menu {
ul.menu {
li {
font-size:16px;position:relative;margin:0;padding:0;
ul {
padding:0;margin:0;display:none;
li {font-size:14px;padding:0px 0px 0px 12px;}
}
> ul {display:block;}
> a {
display:block;padding:3px 5px;margin-bottom:3px;display:relative;
&.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;
> span.count {background:none;border:none;right:7px;top:3px;}
}
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;
}
}
}
}
div.footer {
border-top:1px solid #aaa;padding-top:5px;margin-top:5px;
}
}
div#side ul.menu li.selected > ul, div#side ul.menu li.selected > div.menu ul {display:block;}


/* Record Menus */
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/categories_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def descend_category(category, options = {}) # recursive print out category
end

if options[:admin_controls] # show admin controls
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 != ""
html += "<td align=right class=\"icon_column\">#{icon(:help, category.description, "help")}</td>" if category.description && category.description != ""
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>"
html += "<td align=right class=\"icon_column\">" + link_to(icon("edit"), {:action => "edit", :controller => "categories", :id => category}, :class => "transparent") + "</td>"
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>"
Expand Down
6 changes: 3 additions & 3 deletions app/helpers/users_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def user_avatar(user, options = {})
avatar_image(user, options)
end
else # user doesn't exist
return raw "<img src=\"/themes/#{@setting[:theme]}/images/icons/failure.png\" class=\"icon\" title=\"#{t("notice.item_not_found", :item => User.model_name.human)}\">"
return icon(:failure, "#{t("notice.item_not_found", :item => User.model_name.human)}")
end
end

Expand All @@ -19,10 +19,10 @@ def avatar_image(user, options = {})
if user.avatar.blank? ? false : File.exists?(user.avatar.path)
return image_tag(user.avatar.url, options)
else # get default avatar
return theme_image_tag("default_avatar.png", options)
return image_tag("default_avatar.png", options)
end
else
return theme_image_tag("default_avatar.png", options)
return image_tag("default_avatar.png", options)
end
end

Expand Down
1 change: 0 additions & 1 deletion app/views/application/_head.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<!-- Load Theme Files -->
<%= stylesheet_link_tag "/themes/#{@setting[:theme]}/stylesheets/application.css" %>
<%= javascript_include_tag "/themes/#{@setting[:theme]}/javascripts/application.js" %>
<link rel="shortcut icon" href="/themes/<%= @setting[:theme] %>/images/favicon.ico">

<!-- Load Meta Data -->
Expand Down
21 changes: 9 additions & 12 deletions app/views/categories/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
<% content_for :side do %>
<div class="box_2">
<h2 class="title">
<img src="/themes/<%= @setting[:theme] %>/images/icons/categories.png" class="icon" >
<%= icon(:categories) %>
<%= f.label :category_id %>
</h2>
<%= category_select_tag("category[category_id]", category.category_id, :id_to_ignore => category.id, :include_blank => true) %>
</div>
<% end %>
<%= content_tag :div, :class => :field do %>
<%= content_tag :div, f.label(:name), :class => :label %>
<%= f.text_field :name %>
<% end %>
<table cellpadding=1 cellspacing=1>
<tr>
<td><b><%= f.label :name %></b></td>
<td><%= f.text_field :name %></td>
</tr>
<tr>
<td><b><%= f.label :description %></b></td>
<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>
</tr>
</table>
<div style="clear:both"></div>
<%= content_tag :div, :class => :field do %>
<%= content_tag :div, f.label(:description), :class => :label %>
<%= f.text_field :description %>
<% end %>
2 changes: 1 addition & 1 deletion app/views/items/_preview_not_found.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if options[:size].to_s == "pinky" %>
<%= 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) %>
<%= link_to(image_tag("icons/preview.png", :title => item.description, :class => options[:size].to_s), {:action => "view", :controller => "items", :id => item}, :title => item.name) %>
<% else %>
<%= content_tag :div, :class => "preview_not_found preview_not_found_#{options[:size].to_s} preview_text" do %>
<%= 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) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/plugin_videos/_preview.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
});
</script>

<%= 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 : "") %>
<%= 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 changes: 2 additions & 2 deletions app/views/settings/_setting.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<% when "string" %>
<% when "bool" %>
<%= radio_button_tag "setting[#{setting.name}]", "1", setting.to_bool %>
<%= t("single.positive") %>
<%= label_tag "setting_#{setting.name}_1", t("single.positive") %>
<%= radio_button_tag "setting[#{setting.name}]", "0", !setting.to_bool %>
<%= t("single.negative") %>
<%= label_tag "setting_#{setting.name}_0", t("single.negative") %>
<% when "option" %>
<select name="setting[<%= setting.name %>]">
<% for option in setting.options.split(",") %>
Expand Down
2 changes: 1 addition & 1 deletion public/500.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>Ahh!</h1>
<h1>Internal Server Error</h1>
<h3>This application has encountered an Internal Server Error. This is not good.</h3>
<br>
<i>Code: <b>500</b></i>

0 comments on commit 1fe30d4

Please sign in to comment.