developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ray's changes in structure

This commit is contained in:
rulingcom 2013-07-22 13:45:13 +08:00 committed by chris
parent c8292a7619
commit 408bebaa4b
13 changed files with 114 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/lib/jquery.pageslide.js
View File

@ -142,6 +142,8 @@
});
}
}
$pageName = $self.parents('.item-title').children('a').text();
$('.page-name').text($pageName);
} else if($('.tags-groups').length) {
$(this).parents('li').addClass("active").siblings().removeClass("active").parent('ul').siblings().children('li').removeClass("active");
} else {

72
app/assets/stylesheets/basic/global.css.erb
View File

@ -441,30 +441,78 @@ legend {
/* Edit link in structure */
.page_content {
}
.editable {
position: relative;
padding: 0px;
margin: 0px;
min-height: 50px;
width: 100%;
height: 100%;
}
.edit_link {
display: none;
position: absolute;
left: 2px;
right: 2px;
top: 2px;
bottom: 2px;
border: 2px dashed #1769ff;
border-radius: 5px;
z-index: 1000;
opacity: .3;
filter: alpha(opacity = 30);
background-color: #FFF;
-webkit-transition: all .2s linear;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
transition: all .2s linear;
}
.edit_link a {
position: absolute;
z-index: 10;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-indent: -9999px;
background: url(<%= asset_path 'editicon.png' %>) no-repeat center center rgba(255,255,255,.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
text-indent: -99999px;
}
.edit_link a:before {
content: "\f044";
font-family: FontAwesome;
position: absolute;
top: 50%;
left: 50%;
display: block;
font-size: 1.5em;
width: 24px;
height: 24px;
margin: -12px 0 0 -12px;
text-indent: 0px;
opacity: .4;
filter: alpha(opacity = 40);
-webkit-transition: all .2s linear;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
transition: all .2s linear;
}
.editable:hover .edit_link {
display: block;
opacity: .8;
border: 3px dashed #1769ff;
border-radius: 8px;
filter: alpha(opacity = 80);
}
.editable:hover .edit_link a:before {
font-size: 1.8em;
width: 28px;
height: 28px;
margin: -14px 0 0 -14px;
opacity: 1;
filter: alpha(opacity = 100);
-webkit-transition: all .2s linear;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
transition: all .2s linear;
}

2
app/assets/stylesheets/lib/items.css
View File

@ -100,7 +100,7 @@
content: '';*/
}
#items .sortable .navbar .item-title em {
display: inline-block;
float: right;
padding: 0 5px;
max-width: 300px;
overflow: hidden;

7
app/assets/stylesheets/lib/pageslide.css
View File

@ -17,11 +17,15 @@
-moz-box-shadow: inset 0 0 5px 5px #222;
box-shadow: inset 0 0 5px 5px #222;
}
#pageslide .well {
color: #333333;
}
#pageslide .content {
padding: 15px;
}
#items #pageslide #view-page .content,
#items #pageslide #view-page .pane {
outline: none;
padding: 0px;
margin-top: 57px;
}
@ -48,6 +52,9 @@
#pageslide form {
margin-bottom: 0;
}
#view-page > .content > form {
padding: 0 15px 15px;
}
#pageslide legend {
color: #FFFFFF;
border-bottom: 1px solid #949494;

2
app/models/item.rb
View File

@ -4,7 +4,7 @@ class Item
include Mongoid::Timestamps
include Mongoid::Tree
include Mongoid::Tree::Ordering
LIST = YAML.load(File.read('config/list.yml'))
LIST = YAML.load(File.read("#{Rails.root}/config/list.yml"))
field :name
field :path

2
app/views/admin/items/_node.html.erb
View File

@ -10,6 +10,7 @@
<span title="<%= t(:link) %>" class="item-type link tip"><i class="icon-link"></i></span>
<% end %>
<div class="item-title">
<%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
<%= link_to node.title, "/" + node.path %>
<div class="item-menu">
<%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view) if node.class.to_s.eql?('Page') %>
@ -18,7 +19,6 @@
<%= link_to content_tag(:i, nil, class: "icon-link"), new_admin_link_path(:parent_id => node.id), class: "open-slide tip", title: t(:add_link) if node.class.to_s.eql?('Page') %>
<%= link_to content_tag(:i, nil, class: "icon-trash"), nil, rel: eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "delete tip", title: t(:delete_) unless node.root? %>
</div>
<%= content_tag(:em, node.url, class: "muted") if node.class.to_s.eql?('Link') %>
</div>
<div class="item-info pull-right">
<% @site_valid_locales.each do |valid_locale| %>

2
app/views/admin/links/_edit.html.erb
View File

@ -7,4 +7,4 @@
<%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
</div>
</fieldset>
<% end %>
<% end %>

6
app/views/admin/links/_form.html.erb
View File

@ -3,8 +3,14 @@
<%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
<<<<<<< Updated upstream
<%= f.label :name, t(:name) %>
<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
=======
<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
<span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
>>>>>>> Stashed changes
<%= f.label :url, t(:url) %>
<%= f.text_field :url, :class => 'input-xlarge', placeholder: t(:url) %>

16
app/views/admin/page_parts/_custom_widget_setting.html.erb
View File

@ -1,4 +1,4 @@
<div class="style_switch control-group">
<div class="style_switch control-group">
<label class="control-label">
<%= t("default_widget.select_widget_style") %>
</label>
@ -10,11 +10,11 @@
<% end %>
</div>
</div>
<% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
<div class="style_switch control-group">
<label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
<div class="controls well" >
<%= render :partial=> "widget_ext_options" %>
</div>
<% if(@selected[:module_app] && @selected[:module_app].widget_options(@selected[:app_frontend_url])) %>
<div class="style_switch control-group">
<label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
<div class="controls well" >
<%= render :partial=> "widget_ext_options" %>
</div>
<% end %>
</div>
<% end %>

18
app/views/admin/page_parts/_widget_data_source_category.html.erb
View File

@ -7,16 +7,14 @@
<label class="control-label"><%= t "default_widget.data_source.category" %></label>
<div class="controls">
<% if @categories %>
<fieldset>
<%= nil_checkbox_button(object,:category) %>
<%= content_tag_for(:label, @categories,:class=>"radio inline") do |category|%>
<%= check_box_tag("#{field_name}[category][]", category.id, category_checked_value(object,category.id),:class=>'select_option' )%>
<%= category.title%>
<% end %>
</fieldset>
<p>
<% if @categories %>
<%= nil_checkbox_button(object,:category) %>
<%= content_tag_for(:label, @categories,:class=>"radio") do |category|%>
<%= check_box_tag("#{field_name}[category][]", category.id, category_checked_value(object,category.id),:class=>'select_option' )%>
<%= category.title%>
<% end %>
<% else %>
<%= t("default_widget.no_support_setting")%>
<% end %>
</div>
</p>

16
app/views/admin/page_parts/_widget_data_source_tag.html.erb
View File

@ -7,16 +7,14 @@
<label class="control-label"><%= t "default_widget.data_source.tag" %></label>
<div class="controls">
<p>
<% if @categories %>
<fieldset>
<%= nil_checkbox_button(object,:tag) %>
<%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
<%= check_box_tag("#{field_name}[tag][]", tag.id, tag_checked_value(object,tag.id),:class=>'select_option' ) %>
<%= tag.name%>
<% end if @tags%>
</fieldset>
<%= nil_checkbox_button(object,:tag) %>
<%= content_tag_for(:label, @tags,:class=>"radio") do |tag|%>
<%= check_box_tag("#{field_name}[tag][]", tag.id, tag_checked_value(object,tag.id),:class=>'select_option' ) %>
<%= tag.name%>
<% end if @tags%>
<% else %>
<%= t("default_widget.no_support_setting")%>
<% end %>
</div>
</p>

9
app/views/admin/pages/_form.html.erb
View File

@ -4,7 +4,7 @@
<%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
<%= f.hidden_field :id, :value => (@item.id), :id => "object_id" %>
<%= f.label :name, '*' + t(:name) %>
<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %>
<%= f.text_field :name, class: 'input-xlarge', placeholder: t(:name) %>
<span class="help-block"><%= I18n.t("front_page.name_field_helper") %></span>
@ -87,4 +87,9 @@
</label>
<% end %>
<%= hidden_field_tag 'page[enabled_for][]', '' %>
</p>
<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
</div>
</div>
<%=javascript_include_tag "inc/update_cates_and_tags.js" %>
<%= javascript_include_tag "inc/page_widget_edit_interface.js" %>

5
config/locales/new_ui.en.yml
View File

@ -17,6 +17,11 @@ en:
tag: Editing tag
file:
name: File name
front_page:
name_language: Site Title
select_template: Select Template
select_themes: Select Themes
select_module: Select Module
language: Language
login_orbit: Log In to Orbit
merge: Merge