Skip to content

Commit

Permalink
Fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@hulihanapplications
hulihanapplications committed May 22, 2012
2 parents 1fe30d4 + 4a9b698 commit dee5376
Show file tree
Hide file tree
Showing 19 changed files with 139 additions and 80 deletions.
23 changes: 19 additions & 4 deletions app/assets/stylesheets/application.css.scss
View file
Expand Up @@ -15,7 +15,6 @@
@import "compass";



/* SASS Vars */
$default-box-shadow-color: #000;
$default-box-shadow-v-offset: 1px;
Expand Down Expand Up @@ -124,10 +123,26 @@ input#search_box.selected {background:url(bgs/white_trans_25.png) repeat;border:


/* Buttons */
.button_1, .button_1:visited, .button_1:link {color:#eee;@include text-shadow;;padding:1px 5px 1px 5px;border:1px solid black;background:url(bgs/button_1_bg.png) repeat center center;;font-weight:bold;;cursor:pointer;-moz-border-radius: 3px;-webkit-border-radius: 3px;@include opacity(0.9);}
.button_1:hover, .button_2:hover {@include opacity(1);}
.button_1, .button_1:visited, .button_1:link {
color:#eee;
padding:1px 5px 1px 5px;
font-weight:bold;
cursor:pointer;
@include background(linear-gradient(top, #666 0%, #222));
@include border-radius;
border: 1px solid #000;
@include box-shadow(
0px 1px 3px rgba(000,000,000,0.5),
inset 0px 0px 2px rgba(255,255,255,0.7)
);
@include text-shadow(1px 1px 1px #000);
&:hover, .button_2:hover {
@include background(linear-gradient(top, #777 0%, #333));
@include opacity(1);
}
}
.button_2, .button_2:visited, .button_2:link {color:#eee;@include text-shadow;padding:1px 5px 1px 5px;border:1px solid black;background:url(bgs/button_2_bg.png) repeat center center;;font-weight:bold;;cursor:pointer;-moz-border-radius: 3px;-webkit-border-radius: 3px;@include opacity(0.9);}
.button_1, .button_2, #search_button, #search_box, #top, img.loading {@include box-shadow;}
.button_2, #search_button, #search_box, img.loading {@include box-shadow;}


/* Review */
Expand Down
23 changes: 20 additions & 3 deletions app/assets/stylesheets/layout.css.scss 100644 → 100755
View file
Expand Up @@ -11,12 +11,29 @@ a.extra_options {padding:7px 0px;display:block;border-top:1px solid #ccc;}
#wrapper {height:auto !important; height:100%; min-height:100%;position:relative;}
#wrapper > #header, #wrapper > #content, #wrapper > #top > table {width: 900px ; margin: 0 auto ;}
#wrapper > #top, #wrapper > #footer {color:#ccc;}
#wrapper > #top {background:url(bgs/black_trans_10.png) repeat;padding:5px 0px;text-align:right;border-bottom:1px solid #666;}
#wrapper > #top {
background:#333;
padding:5px 0px;
text-align:right;
border-bottom:1px solid #000;
}
#top td {vertical-align:middle;}
#top a:visited, #top a:link, #footer a:visited, #footer a:link {color:#ddd}
#top a:hover, #footer a:hover {color:#fff}
#wrapper > #header {position:relative;height:95px;background:url(bgs/main_logo_bg.png) no-repeat;background-position:bottom left;}
#wrapper > #content {height:100%;padding:5px;padding-top:10px; padding-bottom:70px;height:100%}
#wrapper > #header {
position:relative;
height:95px;
background:url(bgs/main_logo_bg.png) no-repeat;
background-position:bottom left;
// border-top:1px solid #aaa;
}
#wrapper > #content {
height:100%;
padding:5px;
padding-top:10px;
padding-bottom:70px;
height:100%;
}
#wrapper > #content.split-one #main {width:100%}
#wrapper > #content.split-two #main {float:left;width:660px;}
#main .header table {width:100%}
Expand Down
64 changes: 44 additions & 20 deletions app/assets/stylesheets/menu.css.scss
View file
Expand Up @@ -58,32 +58,56 @@ div.header ul.menu {

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 {
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;}

div#side ul.menu {
img.icon {/*display:none;*/}
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;}
}
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;
}
}
> a {
display:block;
padding:3px 5px;
margin-bottom:3px;
display:relative;
&.selected {
color: #ffffff;
@include background(linear-gradient(top, #444 0%, #222));
@include border-radius;
border: 1px solid #000;
@include box-shadow(
0px 1px 3px rgba(000,000,000,0.25),
inset 0px 0px 2px rgba(255,255,255,0.7)
);
text-shadow: 0px 1px 1px rgba(000,000,000,0.4);
// 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;}
}
}
&.selected {
> ul, > div.menu ul {
display:block;
}
}
}
}

/* Record Menus */
div.record {position:relative;}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/settings.css.scss 100644 → 100755
View file
Expand Up @@ -4,7 +4,7 @@ div.settings {
div.setting {
span.name {font-size:0.8em;color:#aaa;padding-left:3px}
div.description {
margin-top:10px;
margin-top:3px;
}
}
}
38 changes: 18 additions & 20 deletions app/views/admin/_menu.html.erb
View file
Expand Up @@ -2,26 +2,24 @@
<%= content_tag :div, :class => "admin menu", :id => "admin-menu" do %>
<ul class="menu">
<%= content_tag(:li, :class => :selected) do %>
<%= link_to(icon("admin") + " " + t("section.title.admin").capitalize, {:action => "index", :controller => "admin"}, :class => params[:controller] == "admin" ? :selected : nil) %>
<%= content_tag :ul do %>
<%= content_tag(:li, :class => %w{items categories plugins plugin_features tools}.include?(params[:controller]) ? :selected : nil) do %>
<%= link_to(icon("items") + " " + Item.model_name.human(:count => :other), {:action => "all_items", :controller => "items"}, :class => params[:action] == "all_items" ? :selected : nil ) %>
<%#= render :partial => "items/all_items_menu" %>
<%= render :partial => "items/menu" %>
<% end if @setting[:section_items] %>
<%= content_tag(:li, :class => (params[:controller] == "pages") ? :selected : nil) do %>
<%= link_to(icon("pages") + " " + Page.model_name.human(:count => :other), {:action => "index", :controller => "pages"}, :class => current_page?(pages_path) && params[:type].blank? ? :selected : nil) %>
<%= render :partial => "pages/menu" %>
<% end %>
<%= content_tag(:li, :class => params[:controller] == "users" || params[:controller] == "groups" || params[:controller] == "messages" || params[:controller] == "logs" ? :selected : nil) do %>
<%= link_to(icon("users") + " " + User.model_name.human(:count => :other), {:action => "index", :controller => "users"}, :class => current_page?(users_path) ? :selected : nil) %>
<%= render :partial => "users/menu" %>
<% end %>
<%= content_tag(:li, :class => params[:controller] == "settings" ? :selected : nil) do %>
<%= link_to(icon("settings") + " " + t("section.title.configure").capitalize, {:action => "index", :controller => "settings"}, :class => params[:controller] == "settings" && params[:action] == "index" ? :selected : nil) %>
<%= render :partial => "settings/menu" %>
<% end %>
<% end %>
<%= link_to(icon("admin") + " " + t("single.overview").capitalize, {:action => "index", :controller => "admin"}, :class => params[:controller] == "admin" ? :selected : nil) %>
<%= content_tag(:li, :class => %w{items categories plugins plugin_features tools}.include?(params[:controller]) ? :selected : nil) do %>
<%= link_to(icon("items") + " " + Item.model_name.human(:count => :other), {:action => "all_items", :controller => "items"}, :class => params[:action] == "all_items" ? :selected : nil ) %>
<%#= render :partial => "items/all_items_menu" %>
<%= render :partial => "items/menu" %>
<% end %>
<%= content_tag(:li, :class => (params[:controller] == "pages") ? :selected : nil) do %>
<%= link_to(icon("pages") + " " + Page.model_name.human(:count => :other), {:action => "index", :controller => "pages"}, :class => current_page?(pages_path) && params[:type].blank? ? :selected : nil) %>
<%= render :partial => "pages/menu" %>
<% end %>
<%= content_tag(:li, :class => params[:controller] == "users" || params[:controller] == "groups" || params[:controller] == "messages" || params[:controller] == "logs" ? :selected : nil) do %>
<%= link_to(icon("users") + " " + User.model_name.human(:count => :other), {:action => "index", :controller => "users"}, :class => current_page?(users_path) ? :selected : nil) %>
<%= render :partial => "users/menu" %>
<% end %>
<%= content_tag(:li, :class => params[:controller] == "settings" ? :selected : nil) do %>
<%= link_to(icon("settings") + " " + t("section.title.configure").capitalize, {:action => "index", :controller => "settings"}, :class => params[:controller] == "settings" && params[:action] == "index" ? :selected : nil) %>
<%= render :partial => "settings/menu" %>
<% end %>
<% end %>
</ul>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/application/_html_allowed.html
View file
@@ -1,6 +1,6 @@
<div align=left >
<h3 class="title">
<img src="/themes/<%= @setting[:theme] %>/images/icons/locked.png" alt="" title="<%= t("single.security") %> <%= t("single.information") %>" class="icon">
<%= icon(:locked) %>
<%= t("single.security") %> <%= t("single.information") %>
</h3>
<%= t("info.html_allowed", :elements => Rails.configuration.action_view.sanitized_allowed_tags.join(", ") )%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/application/_top.html.erb
View file
Expand Up @@ -2,7 +2,7 @@
<table width="100%" cellpadding=0 cellspacing=0>
<tr>
<td>
<% if @setting[:section_items] %>
<% if true %>
<div class="search_box">
<%#= form_remote_tag :update => "content", :url => { :action => 'search'} %>
<%= form_tag({:action => 'search', :controller => "items"},{:id => "search_form", :method => :get}) %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/browse/index.html.erb
View file
Expand Up @@ -2,12 +2,12 @@
homepage = Page.find_by_name("home")
homepage_sidebar = Page.system.find_by_name("home_page_sidebar")
homepage_subpages = homepage.pages.display_in_menu.published.in_order
show_sidebar = homepage_subpages.size > 0 || @setting[:section_items] || !homepage_sidebar.content.blank?
show_sidebar = homepage_subpages.size > 0 || !homepage_sidebar.content.blank?
%>
<% content_for :side do %>
<%= render :partial => "pages/menu_for_page", :locals => {:page => homepage, :subpages => homepage_subpages} if homepage_subpages.size > 0 %>
<% if @setting[:section_items] %>
<% if true %>
<% if @setting[:homepage_type] != "categories" %>
<%= render :partial => "items/category_menu", :locals => {:options => {:category => @category}} %>
<% end %>
Expand All @@ -22,9 +22,9 @@
<% end if show_sidebar %>
<%= render homepage if homepage %>
<% if @setting[:homepage_type] == "new_items" && @setting[:section_items] %>
<% if @setting[:homepage_type] == "new_items" %>
<%= render :partial => "browse/homepage_new_items" %>
<% elsif @setting[:homepage_type] == "categories" && @setting[:section_items] %>
<% elsif @setting[:homepage_type] == "categories" %>
<%= render :partial => "browse/homepage_categories" %>
<% else %>
<%# Display nothing %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/_list_pages.html.erb
View file
Expand Up @@ -9,7 +9,7 @@
<ul id="pages" class="tree <%= "sortable" if options[:sortable] %> collapsed">
<% if pages.size > 0 %>
<% for page in pages %>
<% show_page = (page.name == "items") ? @setting[:section_items] : page.name == "blog" ? @setting[:section_blog] : page.name == "terms_of_service" ? @setting[:allow_user_registration] : true %>
<% show_page = (page.name == "items") ? true : page.name == "blog" ? true : page.name == "terms_of_service" ? @setting[:allow_user_registration] : true %>
<% if show_page %>
<li id="<%= page.id %>" class="root <%= "hoverable" if options[:sortable] %>">
<div class="box_2">
Expand Down
2 changes: 1 addition & 1 deletion app/views/pages/_menu.html.erb
View file
Expand Up @@ -12,7 +12,7 @@
<%= icon("blog_post") + " " + t('activerecord.models.blog_page', :count => :other) %>
<%= content_tag :span, Page.blog_pages.size, :class => :count %>
<% end %>
<% end if @setting[:section_blog] %>
<% end %>
<%= content_tag :li, :class => (params[:type].downcase == "system") ? :selected : nil do %>
<%= link_to pages_path(:type => "System"), :class => (params[:type].downcase == "system") ? :selected : nil do %>
<%= icon("system_page") + " " + t('activerecord.models.system_page', :count => :other) %>
Expand Down
9 changes: 5 additions & 4 deletions app/views/settings/_list_settings.html.erb
View file
Expand Up @@ -6,8 +6,9 @@
</div>
<%= content_tag :em, description if defined?(description) %>
<% for setting in settings %>
<%= render setting %>
<% end %>
<%= content_tag :div, :class => :settings do %>
<% for setting in settings %>
<%= render setting %>
<% end %>
<% end %>
</div>
5 changes: 3 additions & 2 deletions app/views/settings/_setting.html.erb
View file
Expand Up @@ -10,9 +10,10 @@
<td class="half right" align=right>
<% case setting.item_type %>
<% when "string" %>
<%= text_field_tag "setting[#{setting.name}]", setting.value %>
<% when "bool" %>
<%= radio_button_tag "setting[#{setting.name}]", "1", setting.to_bool %>
<%= label_tag "setting_#{setting.name}_1", t("single.positive") %>
<%= label_tag "setting_#{setting.name}_1", t("single.positive") %>
<%= radio_button_tag "setting[#{setting.name}]", "0", !setting.to_bool %>
<%= label_tag "setting_#{setting.name}_0", t("single.negative") %>
<% when "option" %>
Expand All @@ -21,7 +22,7 @@
<% option = option.gsub(/ /,'') %>
<option value="<%= option %>" <%= "SELECTED" if option == setting.value %>><%= t("single.#{option.downcase}", :default => option) %></option>
<% end %>
</select>
</select>
<% when "special" %>
<% if setting.name == "locale" %>
<%= render :partial => "select_locale", :locals => {:options => {:input_name => "setting[#{setting.name}]"}} %>
Expand Down
8 changes: 1 addition & 7 deletions app/views/settings/index.html.erb
View file
Expand Up @@ -12,7 +12,6 @@
<li><a href="#<%= t("single.public") %>"><%= t("single.public") %></a></li>
<li><a href="#<%= t("single.system") %>"><%= t("single.system") %></a></li>
<li><a href="#<%= User.model_name.human(:count => :other) %>"><%= User.model_name.human(:count => :other) %></a></li>
<li><a href="#<%= t("single.section", :count => :other) %>"><%= t("single.section", :count => :other) %></a></li>
<li><a href="#<%= t("activerecord.records.setting.main_logo.title") %>"><%= t("activerecord.records.setting.main_logo.title") %></a></li>
<li><%= link_to "Home", "http://www.google.com" %></li>
</ul>
Expand All @@ -25,14 +24,9 @@
</div>
<div>
<%= render :partial => "/settings/list_settings", :locals => {:settings => Setting.find(:all, :conditions => ["setting_type = ?", "User"]), :title => User.model_name.human}%>
</div>
<div>
<%= render :partial => "/settings/list_settings", :locals => {:settings => Setting.find(:all, :conditions => ["setting_type = ?", "Section"]), :title => t("single.section")}%>
</div>
</div>
<div>
<div class="section">


<div class="header">
<table style="width:100%;" cellpadding=0 cellspacing=0>
<tr>
Expand Down
11 changes: 5 additions & 6 deletions app/views/settings/themes.html.erb
View file
Expand Up @@ -18,7 +18,7 @@
<div>
<%= form_tag({:action => "update_settings"}) do %>

<table width="100%" cellpadding=0 cellspacing=0 class="setting_table row_table">
<table class="cell setting_table row_table" cellpadding=0 cellspacing=0>
<% for theme in @themes %>
<% @class = cycle("row_a", "row_b") %>
<tr class="<%= @class %>">
Expand All @@ -33,7 +33,7 @@
<%= t("single.negative") %> <%= t("single.preview") %>
<% end %>
</td>
<td align=left style="padding-left:10px;vertical-align:middle">
<td class="left">

<% theme_config_file = Rails.root.to_s + "/public" + "/themes/#{theme}/theme.yml" %>
<% if File.exists?(theme_config_file)%>
Expand All @@ -42,17 +42,16 @@
<%#= theme_file.inspect %>
<h2 class="title"><%= h theme_file["theme"]["name"] %></h2>
<i><%= h theme_file["theme"]["description"] %></i><br>
<div class="spacer"></div>
<%= tag :hr %>
<%= t("single.by") %> <a href="<%= h theme_file["theme"]["author_website"] %>" target="_blank"><b><%= h theme_file["theme"]["author"] %></b></a><br>
<%= t("single.version") %> : <b><%= h theme_file["theme"]["version"] %></b>

<img src="/themes/<%= @setting[:theme] %>/images/icons/link.png" class="icon" alt="" >
<%= icon :link %>
<a href="<%= h theme_file["theme"]["theme_website"] %>" target="_blank"><b><%= t("single.theme")%> <%= t("single.website")%></b></a>
<%= icon("public") %>
<%= link_to t("single.preview"), {:action => params[:action], :theme => theme}, :target => "_blank" %>
<img src="/themes/<%= @setting[:theme] %>/images/icons/delete.png" class="icon" alt="" title="delete" >
<%= link_to t("single.delete"), {:action => "delete_theme", :controller => "settings", :theme_name => theme}, :confirm => t("confirm.general") %>
<%= link_to icon(:delete) + " " + t("single.delete"), {:action => "delete_theme", :controller => "settings", :theme_name => theme}, :confirm => t("confirm.general") %>
<% else %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/user/_menu.html.erb
View file
Expand Up @@ -6,7 +6,7 @@
<% end %>
<%= content_tag :li, :class => params[:controller] == "items" ? :selected : nil do %>
<%= link_to(icon("items") + " " + Item.model_name.human(:count => :other), {:action => "my", :controller => "items"}, :class => params[:controller] == "items" ? :selected : nil) %>
<% end if (Setting.get_setting_bool("let_users_create_items") || @logged_in_user.is_admin?) && @setting[:section_items] %>
<% end if (Setting.get_setting_bool("let_users_create_items") || @logged_in_user.is_admin?) %>
<%= content_tag :li, :class => params[:controller] == "messages" ? :selected : nil do %>
<%= link_to(icon("mail") + " " + UserMessage.model_name.human(:count => :other), {:action => "for_me", :controller => "messages"}, :class => params[:controller] == "messages" ? :selected : nil) %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/show.html.erb
View file
Expand Up @@ -72,7 +72,7 @@
<%= @user.group.name %>
<% end if @logged_in_user.is_admin? %>
<% if @setting[:section_items] && @items.size > 0 %>
<% if @items.size > 0 %>
<%= render :partial => "navigation" %>
<br>

Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
View file
Expand Up @@ -118,6 +118,7 @@ en:
unknown: Unknown
home: Home
blog: Blog
overview: Overview
# Flash Messages & Notices
notice:
save_success: Your changes have been successfully saved!
Expand Down

0 comments on commit dee5376

Please sign in to comment.