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

Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config

Browse Source 
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-12-05 11:36:32 +08:00
2 parents 4bc80f2bd3 e429aa9425
commit ca290f3519
262 files changed
+7692 -2403
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/.swp
BIN
View File
Binary file not shown.
app/views/admin/ad_banners/_ad_banner_tab.html.erb
+2 -2
View File
@@ -22,7 +22,7 @@
<%if (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%>
<%= content_tag :div ,:class=>'adbanner-action' do%>
<%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
<%= link_to t(:preview), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
<% end -%>
<% end -%>
<ul class="clear">
@@ -30,7 +30,7 @@
</ul>
<% if at_least_module_manager %>
<%= show_ad_banner_permission_link ad_banner_tab%>
<%= link_to t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
<%= link_to t(:delete_),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
<% end -%>
<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
app/views/admin/ad_banners/_ad_image_update.html.erb
+1 -1
View File
@@ -7,7 +7,7 @@
<%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>
<p>
<%= link_to t('edit'),edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn btn-primary' %>
<%= link_to t('delete'),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
<%= link_to t(:delete_),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
</p>
<% end -%>
</li>
app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+1 -1
View File
@@ -25,7 +25,7 @@
<div class="control-group">
<%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
<div class="controls">
<%= f.text_field :best_size %> Ex: 500px x 300px
<%= f.text_field :best_size %> <%= t('ad.best_size_example') %>
</div>
</div>
app/views/admin/ad_banners/_modal_preview.html.erb
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="modal hide fade in banner-preview" id="slideshow-<%=ad_banner.title.dehumanize%>">
<div class="modal-header">
<a class="close" data-dismiss="modal">×</a>
<h3><%= t("modal.preview") %></h3>
<h3><%= t(:preview) %></h3>
</div>
<div class="modal-body">
<p class="ad_banner_slideshow">
@@ -13,7 +13,7 @@
</p>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
</div>
<div>
<script type="text/javascript" src="/static/kernel.js"></script>
app/views/admin/ad_banners/_preview_block.html.erb
+2 -2
View File
@@ -1,10 +1,10 @@
<% if ad_banner -%>
<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
<%= link_to t(:preview),"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
<div class="modal hide fade in banner-preview" id='slideshow-<%=ad_banner.title.dehumanize%>'>
<div class="modal-header">
<a class="close" data-dismiss="modal">×</a>
<h3>Modal header</h3>
<h3><%= t(:preview) %></h3>
</div>
<div class="modal-body">
<p class="ad_banner_slideshow">
app/views/admin/ad_images/_form.html.erb
+14 -14
View File
@@ -17,9 +17,9 @@
<div id="sub-wiget">
<div id="widget-date" class="widget-box">
<div class="widget-action clear">
<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
<a href="#" class="action"><i title="<%= t('ad.set_dates') %>" class="icon-exclamation-sign icon-white tip"></i></a>
</div>
<h3 class="widget-title"><i class="icons-calendar icons-white"></i><%= t('nccu.date') %></h3>
<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
<div class="widget-content clear">
<div id="calendarRange">
<div class="input-append">
@@ -71,9 +71,9 @@
<div id="widget-picture" class="widget-box">
<div class="widget-action clear">
<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
<a class="action"><i title="<%= t('ad.upload_pictures') %>" class="icon-exclamation-sign icon-white tip"></i></a>
</div>
<h3 class="widget-title"><i class="icons-picture icons-white"></i><%= t('nccu.picture') %></h3>
<h3 class="widget-title"><i class="icons-pictures"></i><%= t(:picture) %></h3>
<div class="widget-content clear">
<div class="control-group">
<div class="upload-picture">
@@ -99,9 +99,9 @@
<div id="widget-type" class="widget-box">
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Upload pictures"></i></a>
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.select_fx') %>"></i></a>
</div>
<h3 class="widget-title"><i class="icons-star-thin icons-white"></i><%= t(:type) %></h3>
<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:type) %></h3>
<div class="widget-content clear">
<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
</div>
@@ -109,21 +109,21 @@
<div id="widget-time" class="widget-box widget-size-300">
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Set the range time"></i></a>
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.set_range') %>"></i></a>
</div>
<h3 class="widget-title"><i class="icons-time icons-white"></i><%= t(:frequency) %></h3>
<h3 class="widget-title"><i class="icons-time"></i><%= t(:frequency) %></h3>
<div class="widget-content clear">
<%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
<%= f.text_field :weight ,:class=> 'span3',:placeholder=> t('ad.chinese_1') %>
</div>
</div>
<div id="widget-link" class="widget-box widget-size-300">
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Add a reference link"></i></a>
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.add_link') %>"></i></a>
</div>
<h3 class="widget-title"><i class="icons-link icons-white"></i><%= t(:link) %></h3>
<h3 class="widget-title"><i class="icons-landscape"></i><%= t(:link) %></h3>
<div class="widget-content clear">
<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
<%= f.text_field :out_link ,:class=> 'span3',:placeholder => t('ad.chinese_2') %>
</div>
</div>
@@ -143,7 +143,7 @@
<%= content_tag :div,:class => "tab-pane #{active_when_current_locale_eq locale}",:id=>"#{locale}" do%>
<div class="title">
<%= f.fields_for :title_translations do |f| %>
<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => "輸入標題", :value => (@ad_image.title_translations[locale] rescue nil) %>
<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => t('ad.chinese_1'), :value => (@ad_image.title_translations[locale] rescue nil) %>
<% end %>
</div>
<br/>
@@ -160,7 +160,7 @@
</div>
</div>
<div class="form-actions">
<%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
<%#= link_to t(:preview), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
<%= f.submit t("submit"),:class=>"btn btn-primary" %>
<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
</div>
app/views/admin/app_auths/index.html.erb
+1 -1
View File
@@ -37,7 +37,7 @@
<td class="action">
<%= link_to t(:show), admin_module_app_path(module_app), :class => 'show' %>
<%= link_to t(:edit), edit_admin_module_app_path(module_app), :class => 'edit' %>
<%= link_to t(:delete), admin_module_app_path(module_app), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
<%= link_to t(:delete_), admin_module_app_path(module_app), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
</td>
</tr>
<tr>
app/views/admin/asset_categories/_asset_category.html.erb
+1 -1
View File
@@ -6,7 +6,7 @@
<ul class="nav nav-pills hide">
<li><%= link_to t(:edit), edit_admin_asset_category_path(asset_category), :remote => true %></li>
<li><%= link_to t(:delete), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
<li><%= link_to t(:delete_), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
</ul>
</div>
app/views/admin/asset_categories/_form.html.erb
+2 -2
View File
@@ -2,7 +2,7 @@
<%= form_for(@asset_category, :remote => true, :url => @url) do |f| %>
<h2><%= (@asset_category.new_record? ? 'Add' : 'Edit') %></h2>
<h2><%= (@asset_category.new_record? ? t(:add) : t(:edit)) %></h2>
<div id="widget-title">
<%= f.label :key %>
@@ -13,7 +13,7 @@
<%= f.fields_for :title_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
<div class="control-group">
<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<div class="controls">
<%= f.text_field locale, :class => 'input-xxlarge', :value => (@asset_category.title_translations[locale] rescue nil) %>
</div>
app/views/admin/assets/_asset.html.erb
+2 -2
View File
@@ -2,11 +2,11 @@
<td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td>
<td><%= asset.title rescue nil %></td>
<td>
<i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
<i class="icons-pictures img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><%= link_to t(:edit), edit_admin_asset_path(asset), :remote => true, :class => 'edit' %></li>
<li class="dropdown"><%= link_to t(:delete), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
<li class="dropdown"><%= link_to t(:delete_), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
</ul>
</div>
</td>
app/views/admin/attributes/_attribute_field.html.erb
+11 -11
View File
@@ -10,15 +10,15 @@
<% end %>
<td class='select_type'>
<ul>
<li>markup<%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
<li>markup_value<%= f.text_field :markup_value,:size=>50 %></li>
<li>markup_options<%= f.text_field :markup_options,:size=>50 %></li>
<li>locale<%= f.check_box :locale,{},true,false %></li>
<li>built_in<%= f.check_box :built_in,{},true,false %></li>
<li>disabled<%= f.check_box :disabled,{},true,false %></li>
<li>add_more<%= f.check_box :add_more,{},true,false %></li>
<li>neutral_title<%= f.text_field :neutral_title,:size=>50 %></li>
<li>neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
<li><%= t(:markup) %> : <%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
<li><%= t(:markup_value) %> : <%= f.text_field :markup_value,:size=>50 %></li>
<li><%= t(:markup_options) %> : <%= f.text_field :markup_options,:size=>50 %></li>
<li><%= t(:locale) %> : locale<%= f.check_box :locale,{},true,false %></li>
<li><%= t(:built_in) %> : built_in<%= f.check_box :built_in,{},true,false %></li>
<li><%= t(:disabled) %> : disabled<%= f.check_box :disabled,{},true,false %></li>
<li><%= t(:add_more) %> : add_more<%= f.check_box :add_more,{},true,false %></li>
<li><%= t(:neutral_title) %> : neutral_title<%= f.text_field :neutral_title,:size=>50 %></li>
<li><%= t(:neutral_for) %> : neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
<!--
<li><%#= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%> </li>
<li><%#= t(:options) %>: <%#= f.text_field :markup_value%></li>
@@ -27,14 +27,14 @@
</td>
<td class="action">
<% if attribute_field.new_record? %>
<a href="#" class="delete"><%= t(:delete) %></a>
<a href="#" class="delete"><%= t(:delete_) %></a>
<% else %>
<%= f.hidden_field :id %>
<% if attribute_field.is_built_in? %>
<a href="#" class="switch" id="<%= attribute_field.id %>"></a>
<%= f.hidden_field :disabled, :value => attribute_field.is_disabled? , :class => 'built_in_state' %>
<% else %>
<a href="#" class="remove_existing_record delete"><%= t(:delete) %></a>
<a href="#" class="remove_existing_record delete"><%= t(:delete_) %></a>
<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
<% end %>
<% end %>
app/views/admin/attributes/edit.html.erb
+7 -7
View File
@@ -1,34 +1,34 @@
<%= form_for @attribute,:url => admin_info_path(@attribute) ,:class=> "form-horizontal" do |f| %>
<div class="site-map role-block">
<div class="map-block back">
<h4><span><%= t("admin.info")%></span></h4>
<h4><span><%= t(:info)%></span></h4>
<div class="form-horizontal">
<div class="clear">
<div class="control-group pull-left">
<label class="control-label" for="key"><%= t("admin.key") %></label>
<label class="control-label" for="key"><%= t(:key) %></label>
<div class="controls">
<% if @attribute.new_record? %>
<%= f.text_field :key,:placeholder=>"Key" %>
<%= f.text_field :key, :placeholder => t(:key) %>
<% else %>
<div><%= @attribute.key%></div>
<% end %>
</div>
</div>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.item_name"),:field_name=>"info[title_translations]"}%>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"info[title_translations]"}%>
</div>
</div>
</div>
<% @attribute_fields_upper_object.each do |attribute|%>
<div class="map-block back attributes">
<h4><span><%= attribute.title+ t("admin.attributes")%></span></h4>
<h4><span><%= attribute.title+ t(:attributes)%></span></h4>
<%= render :partial=>"shared/attribute_field/attribute_field",:collection=>attribute.attribute_fields%>
</div>
<% end %>
</div>
<div class="form-actions form-fixed pagination-right">
<%= link_to content_tag(:i,t("admin.infos.add_attribute_field"),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%>
<%= f.submit t("admin.infos.save"),:class=>"btn btn-primary"%>
<%= link_to content_tag(:i,t(:add_attribute_field),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%>
<%= f.submit t(:save),:class=>"btn btn-primary"%>
</div>
<% end %>
app/views/admin/attributes/index.html.erb
+1 -1
View File
@@ -23,7 +23,7 @@
<%= link_to t(:enable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? 'none' : ''}", :class => 'switch' %>
<%= link_to t(:disable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? '' : 'none'}", :class => 'switch' %>
<% if !attribute.is_built_in? %>
<%= link_to t(:delete), eval("admin_#{@attribute_type}_path(attribute)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
<%= link_to t(:delete_), eval("admin_#{@attribute_type}_path(attribute)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
<% end %>
</td>
</tr>
app/views/admin/components/_user_role_management.html.erb
+2 -2
View File
@@ -19,12 +19,12 @@
<% end %>
<% unless auth.nil? %>
<% auth.roles.each do |role| %>
<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>
<li> <%= role.key %> <%= t(:built_in) %> :<%= role.built_in ? t(:yes_) : t(:no_) %>
<%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'role',:target_id=>role.id),:method => :delete %></li>
<% end %>
<ul>Sub Roles </ul>
<% auth.sub_roles.each do |role| %>
<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %> </li><%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'sub_role',:target_id=>role.id),:method => :delete %>
<li> <%= role.key %> <%= t(:built_in) %> :<%= role.built_in ? t(:yes_) : t(:no_) %> </li><%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'sub_role',:target_id=>role.id),:method => :delete %>
<% end %>
<ul>PrivilegeList </ul>
<% auth.privilege_users.each do |user| %>
app/views/admin/dashboards/index.html.erb
+4 -4
View File
@@ -3,7 +3,7 @@
<% end -%>
<div id="isotope">
<div class="item element">
<h3><i class="icons-content"></i><%= t(:content) %></h3>
<h3><i class="icons-booklet"></i><%= t(:content) %></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:all_content) %></span><%= @module_app_contents_total %></p>
<table class="table table-striped">
@@ -445,7 +445,7 @@
<div class="item element">
<h3><i class="icons-"></i><%= t(:traffic) %></h3>
<h3><i class="icons-plane"></i><%= t(:traffic) %></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:total_visitors) %></span><%= display_visitors %></p>
<table class="table table-striped">
@@ -493,7 +493,7 @@
</div>
<div class="item element">
<h3><i class="icons-"></i><%= t(:recent_update) %></h3>
<h3><i class="icons-update"></i><%= t(:recent_update) %></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
<thead>
@@ -530,7 +530,7 @@
</div>
<div class="item element">
<h3><i class="icons-"></i><%= t(:most_visited_page) %></h3>
<h3><i class="icons-trophy"></i><%= t(:most_visited_page) %></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
<thead>
app/views/admin/designs/_design.html.erb
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit' %></li>
<li class="dropdown"><%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
<li class="dropdown"><%= link_to t(:delete_), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
</ul>
</div>
</td>
app/views/admin/designs/_design_file.html.erb
+1 -1
View File
@@ -5,7 +5,7 @@
<%= f.hidden_field :id %>
<%= f.hidden_field :file %>
<%= f.hidden_field :to_destroy %>
<a class="remove_mark" href="#"><%= t('Delete') %></a>
<a class="remove_mark" href="#"><%= t(:delete_) %></a>
<% end %>
<% if classes.include?('r_edit') %>
<a class="edit_mark" href="#"><%= t('Edit') %></a>
app/views/admin/designs/_images.html.erb
+2 -2
View File
@@ -16,7 +16,7 @@
<div class="modal hide fade" id="imageModal" tabindex="-1" role="dialog" aria-labelledby="imageModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="imageModalLabel">Add image</h3>
<h3 id="imageModalLabel"><%= t(:add_image) %></h3>
</div>
<%= form_for :image, :url => upload_image_admin_design_path, :html => {:id => 'ajaxForm', :class => 'form-horizontal'}, :method => :post do |f| %>
<div class="modal-body">
@@ -28,7 +28,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
<%= f.submit t(:add), :class => "btn btn-primary" %>
</div>
<% end %>
app/views/admin/designs/edit.html.erb
+4 -4
View File
@@ -5,12 +5,12 @@
<h1><%= t('editing.design') %></h1>
<ul class="nav nav-tabs" id="myTab">
<li class="active"><a href="#info" data-toggle="tab"><%= t('design.info') %></a></li>
<li class="active"><a href="#info" data-toggle="tab"><%= t(:info) %></a></li>
<li><a href="#layout" data-toggle="tab"><%= @design.layout.name %></a></li>
<li><a href="#css_default" data-toggle="tab"><%= @design.css_default.name %></a></li>
<li><a href="#css_reset" data-toggle="tab"><%= @design.css_reset.name %></a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.themes') %> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(:themes) %> <b class="caret"></b></a>
<ul class="dropdown-menu">
<% @design.themes.each do |theme| %>
<li><a href="#<%= dom_id theme %>" data-toggle="tab"><%= theme.name %></a></li>
@@ -18,14 +18,14 @@
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.javascripts') %> <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(javascripts) %> <b class="caret"></b></a>
<ul class="dropdown-menu">
<% @design.javascripts.each do |js| %>
<li><a href="#<%= dom_id js %>" data-toggle="tab"><%= js.name %></a></li>
<% end %>
</ul>
</li>
<li><a href="#images" data-toggle="tab"><%= t('design.images') %></a></li>
<li><a href="#images" data-toggle="tab"><%= t(:images) %></a></li>
</ul>
<div class="tab-content">
app/views/admin/infos/_form.html.erb.bak
-70
View File
@@ -1,70 +0,0 @@
<div class="attributes_block <%= @class %>">
<h2><%= t("#{@attribute_type}") %></h2>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<tr class="list_item">
<td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td>
<%= f.fields_for :title_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
<td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td>
<% end %>
<% end %>
</tr>
</tbody>
</table>
</div>
</div>
<div class="attributes_block <%= @class %>">
<h2>Attributes</h2>
<div class="info_input">
<table id='attributes' border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t('admin.key') %></td>
<td><%= t('admin.cross_lang') %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
<td><%= t(:type)%></td>
<td>&nbsp;</td>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="6">
<%= hidden_field_tag 'attribute_field_count', @attribute.attribute_fields.count %>
<a href="#" class="add"><%= t(:add) %></a>
</td>
</tr>
</tfoot>
<tbody>
<% @attribute.attribute_fields.each do |attribute_field| %>
<%= render :partial => 'attribute_field', :object => attribute_field, :locals => {:f => f} %>
<% end %>
</tbody>
</table>
</div>
</div>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "attribute_form" %>
<script>
$('.attributes_block a.add').live('click', function(){
var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_attribute_fields", "g");
$(this).prev().attr('value', parseInt(new_id) + 1);
$('#attributes').append(("<%= escape_javascript(add_attribute 'admin/attributes/attribute_field', f, :attribute_fields) %>").replace(old_id, new_id));
});
</script>
<% end %>
app/views/admin/links/delete.html.erb
+1 -1
View File
@@ -1,7 +1,7 @@
<% form_for :link, :url => admin_link_path(@item), :html => { :method => :delete } do |f| %>
<h2><%= t('sure?') %></h2>
<p>
<%= submit_tag t(:delete) %>
<%= submit_tag t(:delete_) %>
<%= link_back %>
</p>
<% end %>
app/views/admin/module_apps_new_interface/_modal_list.html.erb
+1 -1
View File
@@ -22,7 +22,7 @@
<divl>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
</div>
<div>
<script type="text/javascript" src="/static/kernel.js"></script>
app/views/admin/module_store/index.html.erb
+58
View File
@@ -0,0 +1,58 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'modulestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
// Banner slideshow
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 600,
timeout: 4000,
slideExpr: 'img',
next: '.next',
prev: '.prev'
});
});
</script>
<% end %>
<div class="md-bg">
<div class="modulestore md-store">
<div class="header">
<h1 class="home"><a href="modulestore">Orbit Module Store</a></h1>
<div class="slide-wrap">
<div class="slide-feature"></div>
<div class="slide">
<div class="slide-nav">
<a class="prev" href="#">&lsaquo;</a>
<a class="next" href="#">&rsaquo;</a>
</div>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
</div>
</div>
</div>
<div class="main">
<div class="app-list row">
<% 9.times do %>
<div class="app span3">
<a href="module_store/show">
<img src="<%= asset_path 'modulestore/app.jpg' %>" alt="App" />
<div class="detail">
<strong class="apptitle">Orange theme</strong>
<em class="price">Free download</em>
</div>
</a>
</div>
<% end %>
</div>
</div>
</div>
app/views/admin/module_store/show.html.erb
+97
View File
@@ -0,0 +1,97 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'modulestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 'fast',
timeout: 4000,
pager: '.detail-slide-nav',
pagerEvent: 'mouseover',
slideExpr: 'img'
});
});
</script>
<% end %>
<div class="modulestore-detail md-store">
<div class="header">
<h1 class="home"><a href="modulestore.html">Orbit Module Store</a></h1>
</div>
<div class="main row-fluid clearfix">
<div class="left-col span3">
<%= image_tag 'modulestore/app-icon.jpg', :class => "app-icon" %>
<a href="#" class="price btn btn-primary">Free download</a>
<ul class="download-meta">
<li><strong class="downloads">Download:<span> 257985 times</span></strong></li>
<li>
<h3 class="who-are-using-this-apps">Who are using this apps?</h3>
<ul>
<li>NTU College of Liberal Arts</li>
<li>NTU Department of Mathematics</li>
<li>NCKU Graduate Institute of Communication Engineering</li>
<li>NCCU Graduate Institute of Biomedical Electronics and Bioinformatics</li>
<li>NTHU Nano-Electro-Mechanical System Research Center</li>
</ul>
</li>
<li>
<h3 class="recommends">Who are using this also like</h3>
<ul class="recommend-thumbs">
<li>
<a href=""><%= image_tag 'modulestore/dropbox.jpg' %></a>
<a href=""><%= image_tag 'modulestore/screen-capture.jpg' %></a>
<a href=""><%= image_tag 'modulestore/deault-app-icon.jpg' %></a>
</li>
</ul>
</li>
</ul>
</div>
<div class="right-col span6">
<ul class="breadcrumb">
<li><a href="Orbit_module_home.html">Home</a> <span class="divider">/</span></li>
<li class="active">Orbit</li>
</ul>
<h2>Orbit app name here</h2>
<h3>Description</h3>
<p class="app-description">
Orbit Blog makes it easy to post text, photos and video onto your blog.
We created Orbit blog to give you an easy way to share your thoughts about current events, what's going on in your life, or anything else you'd care to discuss with the world. We've developed a host of features to make blogging as simple and effective as possible:
* Free hosting for your images, video, and blog content
* Powerful Template Designer for customizing your blog's look and feel
* Drag and drop widget arrangements
* Hundreds of background images and of flexible default templates
* Built-in blog stats for realtime traffic data
* Easy, built-in monetization with AdSense
* Mobile support for blogging-on-the-go
* Use your custom URL for free
* Support for individual, team, and private blogs
* Post and comment notifications
* Gadget directory with hundreds of free widgets and add-ons
* Available in 4 languages
</p>
<div class="screenshots">
<h3>Screenshots</h3>
<div class="slide">
<div class="detail-slide-nav">
</div>
<a href="#"><%= image_tag 'modulestore/screenshot1.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot2.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot3.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot4.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot5.jpg' %></a>
</div>
</div>
<div>
</div>
</div>
app/views/admin/object_auths/index.html.erb
+1 -1
View File
@@ -24,7 +24,7 @@
<td class="action">
<%= link_to t(:show), admin_object_auth_path(object_auth), :class => 'show' %>
<%= link_to t(:edit), edit_admin_object_auth_path(object_auth), :class => 'edit' %>
<%= link_to t(:delete), admin_object_auth_path(object_auth), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
<%= link_to t(:delete_), admin_object_auth_path(object_auth), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
</td>
</tr>
<tr>
app/views/admin/object_auths_new_interface/_modal_list.html.erb
+1 -1
View File
@@ -22,7 +22,7 @@
<divl>
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
</div>
<div>
<script type="text/javascript" src="/static/kernel.js"></script>
app/views/admin/pages/_form.html.erb
+1 -1
View File
@@ -58,7 +58,7 @@
</div>
</div>
<div class="control-group">
<%= f.label :frontend_data_count, t('admin.frontend_data_count'), :class => 'control-label' %>
<%= f.label :frontend_data_count, t(:frontend_data_count), :class => 'control-label' %>
<div class="controls">
<%= f.text_field :frontend_data_count %>
</div>
app/views/admin/pages/delete.html.erb
+1 -1
View File
@@ -1,7 +1,7 @@
<% form_for :page, :url => admin_page_path(@page), :html => { :method => :delete } do |f| %>
<h2><%= t('sure?') %></h2>
<p>
<%= submit_tag t(:delete) %>
<%= submit_tag t(:delete_) %>
<%= link_back %>
</p>
<% end %>
app/views/admin/plugins/index.html.erb
+2 -2
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
@@ -10,7 +10,7 @@
<div class="module-nav-view">
<ul class="nav nav-pills">
<%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
<%= link_to t("admin.new_admin.users.all_plugin_summary")%>
<%= link_to t(:all_plugin_summary)%>
<% end -%>
<% @plugins.each do |plugin| %>
<%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
app/views/admin/purchases/index.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="main2">
<h1><%= t('list.puchase') %></h1>
<h1><%= t('list.purchase') %></h1>
<table>
<thead>
<tr>
app/views/admin/roles/_attribute_field.html.erb.bak
-3
View File
@@ -1,3 +0,0 @@
<%= f.fields_for :attribute_fields, attribute_field do |f| %>
<%= render :partial => 'admin/attributes/attribute_field', :object => attribute_field, :locals => {:f => f} %>
<% end %>
app/views/admin/roles/_form.html.erb.bak
-52
View File
@@ -1,52 +0,0 @@
<div class="attributes_block <%= @class %>">
<h2><%= t("#{@attribute_type}") %></h2>
<hr>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<tr class="list_item">
<td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td>
<%= f.fields_for :title_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
<td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td>
<% end %>
<% end %>
</tr>
</tbody>
</table>
</div>
</div>
<div id='sub_roles' class="attributes_block <%= @class %>">
<h2>Sub roles</h2>
<hr>
<% @attribute.sub_roles.each_with_index do |sub_role, i| %>
<%= render :partial => 'form_sub', :object => sub_role, :locals => {:f => f, :i => i} %>
<% end %>
</div>
</div>
<div id='add_sub_role'>
<%= hidden_field_tag 'attribute_field_count', @attribute.sub_roles.count %>
<a href="#" class="add"><%= t(:add) %></a>
</div>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "attribute_form" %>
<script>
$('#add_sub_role a.add').live('click', function(){
var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_sub_roles", "g");
$(this).prev().attr('value', parseInt(new_id) + 1);
$('#sub_roles').append(("<%= escape_javascript(add_attribute 'admin/roles/sub_role', f, :sub_roles) %>").replace(old_id, new_id));
});
</script>
<% end %>
app/views/admin/roles/_form_sub.html.erb.bak
-3
View File
@@ -1,3 +0,0 @@
<%= f.fields_for :sub_roles, form_sub do |f| %>
<%= render :partial => 'sub_role', :object => form_sub, :locals => {:f => f, :i => i} %>
<% end %>
app/views/admin/roles/_sub_role.html.erb.bak
-69
View File
@@ -1,69 +0,0 @@
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<tr class="list_item">
<td><%= sub_role.new_record? ? (f.text_field :key, {:style => "width:150px"}) : sub_role.key %></td>
<%= f.fields_for :title_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
<td><%= f.text_field locale, :style => "width:150px", :value => (sub_role.title_translations[locale] rescue nil) %></td>
<% end %>
<% end %>
</tr>
</tbody>
</table>
<div class="group">
<h2>Attributes</h2>
<div class="info_input">
<table class="sub_role_attributes" border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<td><%= t(:multilingual) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
<td><%= t(:type)%></td>
<td>&nbsp;</td>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="6">
<div id='add_attribute'>
<%= hidden_field_tag 'attribute_field_count', sub_role.attribute_fields.count %>
<a href="#" class="add"><%= t(:add) %></a>
<%= hidden_field_tag 'sub_role_temp_id', (i rescue 'new_sub_roles') %>
</div>
</td>
</tr>
</tfoot>
<tbody>
<% sub_role.attribute_fields.each do |attribute_field| %>
<%= render :partial => 'attribute_field', :object => attribute_field, :locals => {:f => f} %>
<% end %>
</tbody>
</table>
</div>
</div>
</div>
<% content_for :page_specific_javascript do %>
<script>
$('#add_attribute a.add').live('click', function(){
var new_parent_id = $(this).next().attr('value');
var old_parent_id = new RegExp("new_sub_roles", "g");
var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_attribute_fields", "g");
$(this).prev().attr('value', parseInt(new_id) + 1);
$(this).parents('table').append(("<%= escape_javascript(add_attribute 'admin/attributes/attribute_field', f, :attribute_fields) %>").replace(old_id, new_id).replace(old_parent_id, new_parent_id));
});
</script>
<% end unless !sub_role.new_record? %>
app/views/admin/sites/_side_bar.html.erb
+10 -2
View File
@@ -1,5 +1,5 @@
<%= content_tag :li, :class => active_for_controllers('sites') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + content_tag(:span, t('site.settings')), admin_site_site_info_path(@site) %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
<%= content_tag :li, link_to(t('site.info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
@@ -13,5 +13,13 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('designs') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t(:template)), admin_designs_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-brush') + content_tag(:span, t(:template)), admin_designs_path %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('template_store', 'module_store') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cart') + content_tag(:span, t(:purchase)), admin_purchases_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('template_store', 'module_store')) do -%>
<%= content_tag :li, link_to(t('store.template'), admin_template_store_path), :class => active_for_action('template_store', 'index') %>
<%= content_tag :li, link_to(t('store.module'), admin_module_store_path), :class => active_for_action('module_store', 'index') %>
<% end %>
<% end -%>
app/views/admin/tags/_tag.html.erb
+1 -1
View File
@@ -8,6 +8,6 @@
</div>
<div class="action">
<%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true %>
<%= link_to t(:delete), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %>
<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %>
</div>
</div>
app/views/admin/template_store/index.html.erb
+30
View File
@@ -0,0 +1,30 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'templatestore' %>
<% end %>
<div class="templatestore tp-store">
<div class="header">
<h1 class="home"><a href="template_store">Orbit Template Store</a></h1>
</div>
<div class="main">
<div class="template-list row">
<% 9.times do %>
<div class="template span3">
<a href="template_store/show">
<img src="<%= asset_path 'templatestore/template.jpg' %>" alt="Template" />
<div class="detail">
<strong class="template-title">Orange theme</strong>
<em class="price">Free download</em>
</div>
</a>
</div>
<% end %>
</div>
</div>
</div>
app/views/admin/template_store/show.html.erb
+77
View File
@@ -0,0 +1,77 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'templatestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 'fast',
timeout: 4000,
pager: '.detail-slide-nav',
pagerEvent: 'mouseover',
slideExpr: 'img'
});
});
</script>
<% end %>
<div class="templatestore-detail tp-store">
<div class="header">
<h1 class="home"><a href="templatestore.html">Orbit Template Store</a></h1>
</div>
<div class="main row-fluid">
<div class="left-col span3">
<%= image_tag 'templatestore/template-icon.jpg', :class => "template-icon" %>
<a href="#" class="price btn btn-primary">Free download</a>
<ul class="view-meta">
<li><strong class="views">Views:<span> 7985 times</span></strong></li>
</ul>
</div>
<div class="right-col span6">
<ul class="breadcrumb">
<li><a href="Orbit_template_home.html">Home</a> <span class="divider">/</span></li>
<li class="active">Orbit</li>
</ul>
<h2>Orbit Template name here</h2>
<h3>Description</h3>
<p class="template-description">
Orbit Blog makes it easy to post text, photos and video onto your blog.
We created Orbit blog to give you an easy way to share your thoughts about current events, what's going on in your life, or anything else you'd care to discuss with the world. We've developed a host of features to make blogging as simple and effective as possible:
* Free hosting for your images, video, and blog content
* Powerful Template Designer for customizing your blog's look and feel
* Drag and drop widget arrangements
* Hundreds of background images and of flexible default templates
* Built-in blog stats for realtime traffic data
* Easy, built-in monetization with AdSense
* Mobile support for blogging-on-the-go
* Use your custom URL for free
* Support for individual, team, and private blogs
* Post and comment notifications
* Gadget directory with hundreds of free widgets and add-ons
* Available in 4 languages
</p>
<div class="screenshots">
<h3>Screenshots</h3>
<div class="slide">
<div class="detail-slide-nav">
</div>
<a href="#"><%= image_tag 'templatestore/screenshot1.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot2.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot3.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot4.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot5.jpg' %></a>
</div>
</div>
<div>
</div>
</div>
app/views/admin/users/_form.html.erb
-40
View File
@@ -1,40 +0,0 @@
<div id="person" class="clear">
<% if @user.avatar? %>
<%= image_tag(@user.avatar.thumb.url) %>
<% else %>
<%= image_tag "person.png" %>
<% end %>
<%= file_field_tag 'file' %>
<%= hidden_field_tag :avatar_cache %>
<label>
<span><%= t(:email) %>：</span>
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
</label>
<label>
<%= f.check_box :admin %>
<span><%= t(:admin) %>：</span>
</label>
<label>
<span><%= t(:role) %>：</span>
<%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.title, role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %>
</label>
</div>
<%= render :partial => 'info', :collection => @infos, :locals => {:f => f} %>
<div id='roles'>
<% @roles.each do |role| %>
<div id="<%= role.id %>_block" class="attributes_block <%= @class %>" <%= raw(' style="display: none;"') unless ((@user.role.id.eql?(role.id) rescue nil) || (role.key.eql?('student') && @user.new_record?)) %>>
<h2><%= role.title %></h2>
<hr class="<#%= @user.role.key %>_block">
<%= render :partial => 'sub_role_selector', :locals => {:f => f, :role => role} %>
<%= render :partial => 'sub_role', :collection => role.sub_roles, :locals => {:f => f, :role => role} %>
</div>
<% end -%>
</div>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "user_form" %>
<% end -%>
app/views/admin/users/_info.html.erb
-40
View File
@@ -1,40 +0,0 @@
<div id="basic_block" class="attributes_block <%= @class %>">
<h2><%= info.title %></h2>
<hr>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<% info.get_enabled_attribute_fields.each do |attr| %>
<%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %>
<tr class="list_item">
<td><%= attr.title %></td>
<% if attr["locale"] && attr["markup"] == 'text_field' %>
<% @site_valid_locales.each do |locale| %>
<td><%= f.text_field locale %></td>
<% end %>
<% else %>
<td colspan=<%= @site_valid_locales.size %>>
<% if attr["markup"] == "text_field" %>
<%= f.text_field :non_locale %>
<% elsif attr["markup"] == "select" %>
<%= f.select :non_locale, options_for_select(attr["options"], value['non_locale']) %>
<% end -%>
</td>
<% end -%>
<%= f.hidden_field :attribute_field_id, :value => attr.id %>
<%= f.hidden_field :key, :value => attr.key %>
</tr>
<% end %>
<% end %>
</tbody>
</table>
</div>
</div>
app/views/admin/users/_show_attribute.html.erb
-26
View File
@@ -1,26 +0,0 @@
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</thead>
<tbody>
<% show_attribute.get_enabled_attribute_fields.each do |attr| %>
<tr class="list_item">
<td><%= attr.title %></td>
<% @site_valid_locales.each do |locale| %>
<td>
<% if attr["locale"] && attr["markup"] == 'text_field' %>
<%= show_attribute(@user, attr.id, locale) %>
<% else %>
<%= show_attribute(@user, attr.id) %>
<% end %>
</td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
app/views/admin/users/_show_sub_role.html.erb
-4
View File
@@ -1,4 +0,0 @@
<div id="sub_role_<%= show_sub_role.id %>" class="group">
<h2><%= show_sub_role.title %></h2>
<%= render :partial => 'show_attribute', :object => show_sub_role %>
</div>
app/views/admin/users/_side_bar.html.erb
-11
View File
@@ -1,11 +0,0 @@
<div id="search">
<input id="user_search" name="user[username]" size="30" type="text" />
</div>
<div class="member_setup <%= @class %>">
<h1><%= t(:setup_member) %></h1>
<ul class="list">
<li class="set_1"><%= link_to content_tag(:span, t('list.user')), admin_users_path %></li>
<li class="set_2"><%= link_to content_tag(:span, t('list.role')), admin_roles_path %></li>
<li class="set_3"><%= link_to content_tag(:span, t('list.info')), admin_infos_path %></li>
</ul>
</div>
app/views/admin/users/_sub_role.html.erb
-39
View File
@@ -1,39 +0,0 @@
<div id="sub_role_<%= sub_role.id %>" class="group" <%= raw(' style="display: none;"') unless @user.sub_role_ids.include?(sub_role.id) %>>
<h2><%= sub_role.title %></h2>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t(:key) %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<% sub_role.get_enabled_attribute_fields.each do |attr| %>
<%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %>
<tr class="list_item">
<td><%= attr.title %></td>
<% if attr["locale"] && attr["markup"] == 'text_field' %>
<% @site_valid_locales.each do |locale| %>
<td><%= f.text_field locale %></td>
<% end %>
<% else %>
<td colspan=<%= @site_valid_locales.size %>>
<% if attr["markup"] == "text_field" %>
<%= f.text_field :non_locale %>
<% elsif attr["markup"] == "select" %>
<%= f.select :non_locale, options_for_select(attr["options"], value['non_locale']) %>
<% end -%>
</td>
<% end -%>
<%= f.hidden_field :attribute_field_id, :value => attr.id %>
<%= f.hidden_field :key, :value => attr.key %>
</tr>
<% end %>
<% end %>
</tbody>
</table>
</div>
</div>
app/views/admin/users/_sub_role_selector.html.erb
-4
View File
@@ -1,4 +0,0 @@
<% role.sub_roles.each do |sub_role| %>
<%= f.label sub_role.title, :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
<%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :id => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
<% end %>
app/views/admin/users/edit.html.erb
-14
View File
@@ -1,14 +0,0 @@
<% content_for :secondary do %>
<%= render 'side_bar' %>
<% end %>
<div id="profile" class="clear">
<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => 'form', :locals => { :f => f } %>
<div class="button_bar">
<%= link_back %>
<%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
</div>
<% end -%>
</div>
app/views/admin/users/index.html.erb
-42
View File
@@ -1,42 +0,0 @@
<% content_for :secondary do %>
<%= render 'side_bar' %>
<% end %>
<div class="main_list clear">
<%= flash_messages %>
<div class="button_bar up">
<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
</div>
<table>
<thead>
<tr>
<td class="roles"><%= t(:role) %></td>
<td class="name"><%= t(:name) %></td>
<td class="email"><%= t(:email) %></td>
<td class="admin"><%= t(:admin) %></td>
<td class="action"><%= t(:action) %></td>
</tr>
</thead>
<tbody>
<% @users.each do |user| %>
<tr class="have">
<td class="roles <%= user.role.key.downcase rescue nil %>"><%= user.role.title rescue nil %></td>
<td class="name"><%= user.name ? user.name : 'bob' %></td>
<td class="email"><%= user.email %></td>
<td class="admin"><%= user.admin ? t(:yes_) : t(:no_) %></td>
<td class="action">
<%= link_to t(:show), admin_user_path(user), :class => 'show' %>
<%= link_to t(:edit), edit_admin_user_path(user), :class => 'edit' %>
<%= link_to t(:delete), admin_user_path(user), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
</td>
</tr>
<tr>
<td colspan="5"></td>
</tr>
<% end %>
</tbody>
</table>
<div class="button_bar">
<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
</div>
</div>
app/views/admin/users/new.html.erb
-19
View File
@@ -1,19 +0,0 @@
<% content_for :secondary do %>
<%= render 'side_bar' %>
<% end %>
<div id="profile" class="clear">
<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => 'form', :locals => { :f => f } %>
<div class="button_bar">
<%= link_back %>
<%= link_to t('create'), "#", :onclick=>"$('#new_user').submit()" %>
</div>
<% end -%>
</div>
app/views/admin/users/show.html.erb
-33
View File
@@ -1,33 +0,0 @@
<% content_for :secondary do %>
<%= render 'side_bar' %>
<% end %>
<div id="profile" class="clear">
<div id="person">
<% if @user.avatar? %>
<%= image_tag(@user.avatar.thumb.url) %>
<% else %>
<%= image_tag "person.png" %>
<% end %>
<label><span><%= @user.email %></span></label>
</div>
<% @infos.each do |a| %>
<div id="basic_block" class="roles_block <%= @class %>">
<h2><%= a.title %></h2>
<hr>
<%= render :partial => 'show_attribute', :object => a %>
</div>
<% end -%>
<div id="basic_block" class="roles_block <%= @class %>">
<h2><%= @user.role.title %></h2>
<hr class="<%= @user.role.key %>_block">
<%= render :partial => 'show_sub_role', :collection => @user.sub_roles %>
</div>
<div class="button_bar">
<%= link_to t(:edit), edit_admin_user_path(@user) %>
<%= link_back %>
</div>
</div>
app/views/admin/users_new_interface/_deled_quick_edit.html.erb
+3 -3
View File
@@ -1,8 +1,8 @@
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><a href="#"><%= t("admin.new_admin.action.edit")%> </a></li>
<li><a href="#"><%= t(:edit)%> </a></li>
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t("admin.new_admin.action.quick_edit")%><b class="caret"></b></a>
<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit)%><b class="caret"></b></a>
<ul class="dropdown-menu" id="menu1">
<li><a href="#"># TODO:Basic</a></li>
<li><a href="#"># TODO:Picture</a></li>
@@ -11,6 +11,6 @@
<li><a href="#"># TODO:File</a></li>
</ul>
</li>
<li><a href="#"><%= t("admin.new_admin.action.delete")%></a></li>
<li><a href="#"><%= t(:delete_)%></a></li>
</ul>
</div>
app/views/admin/users_new_interface/_filter.html.erb
+14 -14
View File
@@ -1,25 +1,25 @@
<div class="subnav">
<div class="btn-group pull-right view-mode">
<form action="" method="get">
<button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("admin.new_admin.show_mode.index")%></button>
<button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("admin.new_admin.show_mode.summary")%></button>
<button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("admin.new_admin.show_mode.thumbnail")%></button>
<button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("show_mode.index")%></button>
<button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("show_mode.summary")%></button>
<button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("show_mode.thumbnail")%></button>
</form>
</div>
<ul class="nav nav-pills filter">
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.status")%> <b class="web-symbol"></b></a>
<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:status)%> <b class="web-symbol"></b></a>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.category")%> <b class="web-symbol"></b></a>
<a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:category)%> <b class="web-symbol"></b></a>
</div>
</li>
<li class="accordion-group">
<div class="accordion-heading">
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.tags")%> <b class="web-symbol"></b></a>
<a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:tags)%> <b class="web-symbol"></b></a>
</div>
</li>
</ul>
@@ -32,7 +32,7 @@
<a href="#" class="btn">Distinguished</a>
</div>
<div class="filter-clear">
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
</div>
</div>
<div class="accordion-body collapse" id="collapse-category">
@@ -42,7 +42,7 @@
<% end -%>
</div>
<div class="filter-clear">
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
</div>
</div>
<div class="accordion-body collapse" id="collapse-tags">
@@ -52,7 +52,7 @@
<% end -%>
</div>
<div class="filter-clear">
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
<a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
</div>
</div>
<% if params[:at].blank? #header for index%>
@@ -66,11 +66,11 @@
<a href class="list-remove"><i class="icon-minus-sign"></i></a>
<%end%>
</th>
<th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
<th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
<th id="sort-email" class="sort span2"><%= t("admin.new_admin.attributes.publications")%><b class="web-symbol"></b></th>
<th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.courses")%><b class="web-symbol"></b></th>
<th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.followers")%><b class="web-symbol"></b></th>
<th id="sort-roles" class="sort span3"><%= t(:roles)%><b class="web-symbol"></b></th>
<th id="sort-name" class="sort span1-2 select active"><%= t(:name)%><b class="web-symbol"></b></th>
<th id="sort-email" class="sort span2"><%= t(:publications)%><b class="web-symbol"></b></th>
<th id="sort-admin" class="sort span2"><%= t(:courses)%><b class="web-symbol"></b></th>
<th id="sort-admin" class="sort span2"><%= t(:followers)%><b class="web-symbol"></b></th>
</tr>
</thead>
</table>
app/views/admin/users_new_interface/_index_paginator.html.erb
+1 -1
View File
@@ -1,7 +1,7 @@
<div class="form-actions form-fixed pagination-right">
<% if is_admin? %>
<%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
<i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
<i class="icon-plus icon-white"></i><%= t(:add)%>
<% end -%>
<%end -%>
<div class="paginationFixed" id="user_pagination">
app/views/admin/users_new_interface/_plugin_summary.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="item element">
<h3><i class="icons-content"></i>Module Name</h3>
<h3><i class="icons-booklet"></i>Module Name</h3>
<div class="detail w-a h-a">
<table class="table table-striped">
<thead>
app/views/admin/users_new_interface/_role.html.erb
+1 -1
View File
@@ -8,7 +8,7 @@
<% sub_role_disable = @user.sub_roles.include?(sub_role) ? false : true %>
<%#= hidden_field_tag("[user][new_attribute_values][sub_role][disable][#{sub_role.id}]",sub_role_disable)%>
<legend>
<button for=<%=@form_index%> class="onoff pull-right <%= sub_role_disable ? 'disabled' : '' %> ">ON</button><%= sub_role.title %>
<button for=<%=@form_index%> class="onoff pull-right <%= sub_role_disable ? 'disabled' : '' %> "><%= t(:on_upcase) %></button><%= sub_role.title %>
<%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
</legend>
<div class="controls-block <%= sub_role_disable ? 'hide' : '' %>" >
app/views/admin/users_new_interface/_side_bar.html.erb
+7 -7
View File
@@ -1,16 +1,16 @@
<%= content_tag :li, :class => active_for_controllers('users_new_interface') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t('admin.new_admin.user')), admin_users_new_interface_index_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_infos_path ), :class => active_for_action('users_new_interfacexx', 'index') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_roles_path), :class => active_for_action('users_new_interfacexx', 'index') %>
<%= content_tag :li, link_to((t(:all_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
<%= content_tag :li, link_to((t(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
<%= content_tag :li, link_to((t(:roles) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_infos_path ), :class => active_for_action('users_new_interfacexx', 'index') %>
<%= content_tag :li, link_to((t(:info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_roles_path), :class => active_for_action('users_new_interfacexx', 'index') %>
<% end -%>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('plugins') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t('admin.plugins')), admin_plugins_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t(:plugins)), admin_plugins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
<%= content_tag :li, link_to((t('admin.all_plugins') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
<%= content_tag :li, link_to((t(:all_plugins) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
<% end -%>
<% end -%>
app/views/admin/users_new_interface/_sort_headers.html.erb
+6 -6
View File
@@ -1,7 +1,7 @@
<%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
['title', 'title','span4', 'admin.title'],
['description', 'description', 'span1-2', 'admin.data'],
['intro', 'intro', 'span1-2', 'admin.file_type'],
['intro', 'intro', 'span1-2', 'admin.file_length'],
['intro', 'intro', 'span1-2', 'admin.description'],
['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
['title', 'title','span4', 'title'],
['description', 'description', 'span1-2', 'data'],
['intro', 'intro', 'span1-2', 'file_type'],
['intro', 'intro', 'span1-2', 'file_length'],
['intro', 'intro', 'span1-2', 'description'],
['intro', 'intro', 'span1-2', 'tags']).html_safe %>
app/views/admin/users_new_interface/_temp_form.html.erb
+4 -4
View File
@@ -7,12 +7,12 @@
<%= file_field_tag 'file' %>
<%= hidden_field_tag :avatar_cache %>
<label>
<span><%= t('admin.email') %>：</span>
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
<span><%= t(:email) %>：</span>
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
</label>
<label>
<%= f.check_box :admin %>
<span><%= t('admin.admin') %>：</span>
<span><%= t(:admin) %>：</span>
</label>
<label>
@@ -21,7 +21,7 @@
<tr>
<%=render :partial=>"temp_profile",:collection=>Info.all%>
<tr>
<tr> <span><%= t('admin.role') %>：</span> </tr>
<tr> <span><%= t(:role) %>：</span> </tr>
<tr>
<%= render :partial=>"temp_sub_role_from",:collection=>@user.sub_roles %>
</tr>
app/views/admin/users_new_interface/_user_basic.html.erb
+4 -4
View File
@@ -1,11 +1,11 @@
<%#= devise_error_messages! %>
<div class="map-block back">
<h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
<h4><span><%=t(:sys_basic_form)%></span></h4>
<div class="form-horizontal">
<div class="control-group">
<%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
<%= f.label t(:email),:class=>"control-label" %><br />
<div class="controls">
<%= f.email_field :email %>
</div>
@@ -14,7 +14,7 @@
<div class="form-horizontal">
<div class="control-group">
<%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
<%= f.label t(:password),:class=>"control-label" %>
<div class="controls">
<%= f.password_field :password %>
</div>
@@ -23,7 +23,7 @@
<div class="form-horizontal">
<div class="control-group">
<%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
<%= f.label t(:password_confirmation),:class=>"control-label" %>
<div class="controls">
<%= f.password_field :password_confirmation %>
</div>
app/views/admin/users_new_interface/edit.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/admin/users_new_interface/index.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/index_summary.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/index_thumbnail.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/new.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/admin/users_new_interface/plugin_dashbroad.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<div class="member-plugin">
app/views/admin/users_new_interface/show.html.erb
+4 -4
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
@@ -11,7 +11,7 @@
<div class="module-nav-view">
<ul class="nav nav-pills">
<%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
<%= link_to t("admin.new_admin.users.all_plugin_summary")%>
<%= link_to t(:all_plugin_summary)%>
<% end -%>
<% @plugins.each do |plugin| %>
<%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
@@ -38,7 +38,7 @@
<p class="user-mail">
<%= @user.email %>
</p>
<%= link_to("<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
<%= link_to("<i class='icon-pencil'></i>#{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
</div>
<div class="user-roles my_scroll">
<div class="scrollbar">
@@ -50,7 +50,7 @@
</div>
<div class="viewport">
<div class="overview">
<%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"admin.new_admin.users.profile",:items=>@profile_data} %>
<%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"profile",:items=>@profile_data} %>
<%= render :partial=> "show_roles",:collection=>@user.roles %>
<%# @user.sub_roles.each{|sr| render :partial=> "user_role",:locals=>{:role_class=>sr.key.to_s,:i18n=>"admin.new_admin.users.roles.#{sr.key.to_s}",:items=>sr} }%>
app/views/admin/users_new_interface/temp_edit.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/desktop/co_author_relations/_form.html.erb
+4
View File
@@ -0,0 +1,4 @@
<%= form_for(@new_relation , url: desktop_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %>
<%= f.text_field :relation %>
<%= f.submit "Save" %>
<% end %>
app/views/desktop/co_author_relations/_show_form.html.erb
+6
View File
@@ -0,0 +1,6 @@
<%# @co_author_relations.each do |co_author_relation| %>
<tr>
<td><%= show_form.relation %></td>
<td><%= link_to 'Destroy', desktop_co_author_relation_path(show_form), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete" %></td>
</tr>
<%# end %>
app/views/desktop/co_author_relations/index.html.erb
+17
View File
@@ -0,0 +1,17 @@
<h1>Listing co_author_relations</h1>
<%= submit_tag "Back", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<%= render 'form' %>
<table id="co_author_relation_table">
<thead>
<tr>
<th>Relation</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<%= render :partial => 'show_form', :collection => @co_author_relations %>
</tbody>
</table>
app/views/desktop/co_authors/_form.html.erb
+7 -12
View File
@@ -1,6 +1,6 @@
<div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
<!-- <%= submit_tag "Cancel", :class=>"fn_btn hh2 bt-cancel thmc2 thmtxt" %>-->
<%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
</div>
<div></div>
@@ -15,19 +15,14 @@
<%= f.text_field :email %>
</li>
<li class="s_grid_row">
<%= f.label :type%><br />
<select name="co_author[type]" id="" class="s_grid s_grid_4">
<select name="co_author[co_author_relations_id]" id="" class="s_grid s_grid_4">
<%= options_for_select(
[["朋友","朋友"],
["學生","摯友"],
["老師","老師"],
["摯友","摯友"],
["親戚","親戚"],
["同事","同事"],
["共同作者","共同作者"]
])
%>
@co_author_relations.map do |relation|
[relation.relation, relation.id]
end
)%>
</select>
</li>
</ul>
app/views/desktop/co_authors/index.html.erb
+11 -3
View File
@@ -1,4 +1,8 @@
<h1>list all coauthor</h1>
<%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author" %>
<%= link_to "New Type", desktop_co_author_relations_path, :class=>"bt-new-type" %>
<table>
<thead>
<tr>
<th>Name</th>
<th>EMail</th>
@@ -7,14 +11,18 @@
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<% @co_authors.each do |co_author| %>
<tr>
<td><%= co_author.co_author %></td>
<td><%= co_author.email %></td>
<td><%= co_author.type%></td>
<td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?' %></td>
<td><%= @co_author_relations.find(co_author.co_author_relations_id).relation \
unless co_author.co_author_relations_id.nil?%></td>
<td><%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit" %></td>
<td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete" %></td>
</tr>
<% end %>
</tbody>
</table>
<br />
app/views/desktop/index.html.erb
+2 -2
View File
@@ -5,13 +5,13 @@
<ul class="dock_child hh3 thmc4" style="width: 180px;">
<li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_sections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
</ul>
</li>
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
<ul class="dock_child hh3 thmc4" style="width: 180px;">
<li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' custom-load="journal" onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
app/views/desktop/journal_lists/_form.html.erb
+17
View File
@@ -0,0 +1,17 @@
<%= form_for(@desktop_journal_list) do |f| %>
<% if @desktop_journal_list.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(@desktop_journal_list.errors.count, "error") %> prohibited this desktop_journal_list from being saved:</h2>
<ul>
<% @desktop_journal_list.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>
<div class="actions">
<%= f.submit %>
</div>
<% end %>
app/views/desktop/journal_lists/edit.html.erb
+6
View File
@@ -0,0 +1,6 @@
<h1>Editing desktop_journal_list</h1>
<%= render 'form' %>
<%= link_to 'Show', @desktop_journal_list %> |
<%= link_to 'Back', desktop_journal_lists_path %>
app/views/desktop/journal_lists/index.html.erb
+24
View File
@@ -0,0 +1,24 @@
<h1>journal_title -- journal_level</h1>
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview">
<div class="s_grid_con s_form">
<% @journal_lists.each_with_index do |journal_list,i| %>
<% if ( i % 5 ) == 0 %>
<div class="s_grid_con s_form">
<ul>
<% end %>
<li class="s_grid_row">
<%= journal_list %>
</li>
<% if ( i % 5 ) == 4 %>
</ul>
</div>
<% end %>
<% end %>
</div>
</div>
</div>
app/views/desktop/journal_lists/new.html.erb
+5
View File
@@ -0,0 +1,5 @@
<h1>New desktop_journal_list</h1>
<%= render 'form' %>
<%= link_to 'Back', desktop_journal_lists_path %>
app/views/desktop/journal_lists/show.html.erb
+5
View File
@@ -0,0 +1,5 @@
<p id="notice"><%= notice %></p>
<%= link_to 'Edit', edit_desktop_journal_list_path(@desktop_journal_list) %> |
<%= link_to 'Back', desktop_journal_lists_path %>
app/views/desktop/journal_p.html.erb
+3 -3
View File
@@ -14,9 +14,9 @@
<div class="s_menu sm_v" content-type="menu">
<ul id='setting_left_nav'>
<li><a href="<%= desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
<li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
<li><a href="<%= new_desktop_co_author_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" onclick='return false;'>Co-Authors</a></li>
<li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" custom-load="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
<li><a href="<%= desktop_journal_lists_path %>" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
<li><a href="<%= desktop_co_authors_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" custom-load="coauthor" onclick='return false;'>Co-Authors</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
app/views/desktop/journal_pages/_form.html.erb
+67 -18
View File
@@ -1,8 +1,10 @@
<div class="toolbar hh2">
<div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
<!-- class: bt-cancle can't be remove
<%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> -->
<!-- class: bt-cancle can't be remove -->
<% if not @writing_journal.new_record? %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<% end %>
</div>
<div class="hh2 hp sdm">
<div class="sdm_t hh2">Entry Year</div>
@@ -52,7 +54,7 @@
<%= f.text_area :paper_title, size: "20x2", placeholder: "Paper Title", class: "s_grid_6 s_grid"%>
</li>
<li class="s_grid_row">
<%= f.text_field :journal_title, size: "20", placeholder: "Journal Title", class: "s_grid_6 s_grid"%>
<%= f.text_field :journal_title, size: "20", placeholder: "Journal Title", class: "s_grid_6 s_grid", "autocomplete-list" => "journal_title_autocomplete_list" %>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
@@ -113,18 +115,18 @@
<div class="s_grid_con s_form">
<ul>
<li class="s_grid_row">
<%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid"%>
<%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid", "autocomplete-list" => "coauthor_autocomplete_list"%>
<span class="icon-plus input_append"></span>
</li>
<li class="s_grid_row">
<select name="writing_journal[journal_author_type_ids][]" id="" class="s_grid s_grid_4">
<%= options_for_select(
@author_types.map do |author_type|
[author_type.title, author_type.id]
end
)
%>
<select name="writing_journal[journal_author_type_ids][]" id="" class="s_grid s_grid_4">
<%= options_for_select(
@author_types.map do |author_type|
[author_type.title, author_type.id]
end
)
%>
</select>
<select name="writing_journal[journal_paper_type_ids][]" id="" class="s_grid s_grid_2">
@@ -185,15 +187,37 @@
<span class="icon-plus input_append"></span>
<ul>
<li class="s_grid_row">
<div> <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %></div>
<!--
<%= f.fields_for :writing_journal_files, @writing_journal do |wjf| %>
<%= wjf.file_field :file %>
<% end %>
-->
<table>
<thead>
<tr>
<th class="s_grid_2 s_grid">File</th>
<th class="s_grid_2 s_grid">File Name</th>
<th><span id='add_plugin_file' class="icon-plus input_append"></span></th>
</tr>
</thead>
<tfoot>
<tr>
<td>
<div id='add_plugin_file' class="info_input plugin_files_block">
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
<a class="add"><span><i class="icon-plus icon-white"></i> add </span></a>
</div>
</td>
</tr>
</tfoot>
<tbody>
<% @writing_journal.writing_journal_files.each_with_index do |writing_journal_file, i| %>
<%= f.fields_for :writing_journal_files, writing_journal_file do |f| %>
<%= render :partial => 'form_file', :object => writing_journal_file, :locals => {:f => f, :i => i} %>
<% end %>
<% end %>
</tbody>
</table>
</li>
</div>
<div class="s_grid_con s_form">
<li class="s_grid_row">
<%= f.text_area :note, size: "20x2", plcaeholder: "Note", class: "s_grid_6 s_grid"%>
<%= f.text_area :note, size: "20x2", placeholder: "Note", class: "s_grid_6 s_grid"%>
</li>
</ul>
</div>
@@ -207,3 +231,28 @@
</div>
</div>
</div>
<script type="text/javascript">
orbitDesktop.prototype.initializeJournalPapers.journal_title_autocomplete_list = <%= @journal_candidate.to_json.html_safe %>;
orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe %>;
</script>
<%= javascript_include_tag "archive_plugin_form" %>
<script>
$('#add_plugin_file a.add').click(function(){
var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_writing_journal_files", "g");
$(this).prev().attr('value', parseInt(new_id) + 1);
var newfield = $(("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id));
$(this).parents('table').append(newfield);
newfield.find('.action a.delete').click(function(){
newfield.remove();
});
});
$('.action a.remove_existing_record').click(function(){
$(this).next('.should_destroy').attr('value', 1);
$("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
});
</script>
app/views/desktop/journal_pages/_form_file.html.erb
+23
View File
@@ -0,0 +1,23 @@
<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class="list_item">
<td>
<div>
<%= f.file_field :file, class: "s_grid_1 s_grid" %>
<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn s_grid_1 s_grid', :target => '_blank', :title => t(:view)} ) : '' %>
</div>
</td>
<td>
<%= f.text_field :title, :class=>'s_grid_1 s_grid' %>
</td>
<td>
<span class="action">
<% if form_file.new_record? %>
<a class="delete"><i class="icon-remove"></i></a>
<% else %>
<%= f.hidden_field :id %>
<a class="remove_existing_record"><i class="icon-remove"></i></a>
<%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
<% end %>
</span>
</td>
</tr>
app/views/desktop/settings.html.erb
+24 -24
View File
@@ -1,26 +1,26 @@
<div id="settings">
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<span class="thmtxth">Settings</span>
</div>
</div>
<div id="holder">
<div id="panel_l" class="ph">
<div class="s_menu sm_v" content-type="menu">
<ul id='setting_left_nav'>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
<li><a href="<%= desktop_sections_path %>" callback-method="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
</ul>
</div>
</div>
<div id="panel_r" container="true" class="ph pw admbg hp">
</div>
<div class="clear"></div>
</div>
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<span class="thmtxth">Settings</span>
</div>
</div>
<div id="holder">
<div id="panel_l" class="ph">
<div class="s_menu sm_v" content-type="menu">
<ul id='setting_left_nav'>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
<li><a href="<%= edit_user_registration_path %>" callback-method="account" custom-load="account" class="admtxt hh2 w2 hp" load="true" onclick='return false;'>Account</a></li>
<li><a href="<%= desktop_sections_path %>" callback-method="sections" custom-load="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
</ul>
</div>
</div>
<div id="panel_r" container="true" class="ph pw admbg hp">
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
app/views/devise/registrations/edit.html.erb
+5 -16
View File
@@ -1,25 +1,14 @@
<h2>Edit <%= resource_name.to_s.humanize %></h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<div><%= f.submit "Update" %></div>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<div><%= f.label :current_password %>
<%= f.password_field :current_password %></div>
<div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<div><%= f.label :password %>
<%= f.password_field :password %></div>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>
<div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
<%= f.password_field :current_password %></div>
<div><%= f.submit "Update" %></div>
<% end %>
<h3>Cancel my account</h3>
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
<%= link_to "Back", :back %>
app/views/devise/sessions/new.html.erb
+2 -2
View File
@@ -11,8 +11,8 @@
<p class="alert hide">You need to sign in or sign up before continuing.</p>
<div class="main">
<div class="control-group clear">
<%= f.label :email ,t("admin.user_new_interface.email")%>
<%= f.text_field :email, :placeholder => t("admin.user_new_interface.email"), :style => "width: 330px;" %>
<%= f.label :email ,t(:email)%>
<%= f.text_field :email, :placeholder => t(:email), :style => "width: 330px;" %>
<span class="help-inline">Please correct the error</span>
</div>
<div class="control-group clear">
app/views/layouts/_guest_orbit_menu.erb
+2 -2
View File
@@ -1,5 +1,5 @@
<a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
<ul class="dropdown-menu">
<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
</ul>
app/views/layouts/_member_orbit_menu.erb
+3 -3
View File
@@ -1,14 +1,14 @@
<a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
<ul class="dropdown-menu">
<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
<%if (is_admin? rescue false)%>
<li class="divider"></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-flow-cascade') + t(:structure), admin_items_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
<% end -%>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
app/views/layouts/_orbit_bar.html.erb
+30 -42
View File
@@ -9,31 +9,30 @@
<% end -%>
</div>
<ul class="nav">
<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
<li><%= link_to t(:desktop), desktop_path, :class => 'orbit-bar-desktop' %></li>
<li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
<li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li>
</ul>
<ul class="nav pull-right">
<li class="dropdown language">
<a class="dropdown-toggle orbit-bar-language" href="#" data-toggle="dropdown">language</a>
<a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
<ul class="dropdown-menu language-menu">
<% @site_in_use_locales.each do |locale| %>
<%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
<% end %>
</ul>
</li>
<li class="search clear" title="<%= t :search_google %>">
<a class="orbit-bar-search" href="#">search</a>
<li class="search clear" title="<%= t :search_google %>">
<a class="orbit-bar-search" href="#" data-icon="search"></a>
<form class="navbar-search" method="get" action="http://www.google.com/custom">
<input type="hidden" name="client" value="pub-&amp" />
<input type="hidden" name="ie" id="ie" value="utf-8" />
<input type="hidden" name="oe" id="oe" value="utf-8" />
<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
<input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'>
<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
</form>
</li>
<input type="hidden" name="client" value="pub-&amp" />
<input type="hidden" name="ie" id="ie" value="utf-8" />
<input type="hidden" name="oe" id="oe" value="utf-8" />
<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
<input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'>
<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
</form>
</li>
<% if user_signed_in? %>
<li class="dropdown active">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
@@ -42,20 +41,9 @@
<span class="member-name"><%= current_user.name %></span>
</a>
<ul class="dropdown-menu account-menu">
<li>
<a href="#">
<i class="icons-wrench"></i>
<%= t(:account_settings) %>
</a>
</li>
<li>
<a class="orbit-bar-desktop" href="#">
<i class="icons-desktop"></i>
<%= t(:desktop) %>
</a>
</li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + ' ' + t(:logout), destroy_user_session_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' + t(:account_setting), desktop_path+"#settings-account" %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' + t(:desktop), desktop_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' + t(:logout), destroy_user_session_path %></li>
<li class="divider"></li>
<li>
<a href="#">
@@ -67,7 +55,7 @@
</li>
<% else %>
<li class="dropdown bar-login">
<a class="dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
<a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
<div class="dropdown-menu">
<ul class="log">
<li class="title hide"></li>
@@ -91,15 +79,15 @@
<li>
<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
</li>
<li class="divider hide"><span><%= t(:or_lower) %></span></li>
<% end %>
</ul>
<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div>
</li>
<% end %>
</ul>
</div>
</div>
</header>
</li>
<li class="divider hide"><span><%= t(:or_lower) %></span></li>
<% end %>
</ul>
<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div>
</li>
<% end %>
</ul>
</div>
</div>
</header>
app/views/layouts/_side_bar.html.erb
+1 -1
View File
@@ -1,6 +1,6 @@
<div id="main-sidebar" class="my_scroll">
<div id="position">
<%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-dashboard') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
<%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t(:dashboard_)), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
<div id="collapse-menu"><i class="icon-chevron-right"></i><i class="icon-chevron-right"></i></div>
</div>
<div class="scrollbar">
app/views/layouts/_side_bar_content.html.erb
+1 -1
View File
@@ -9,5 +9,5 @@
<div class="content">
<% flash.each do |key, msg| %>
<%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
<% end%>
<% end %>
</div>
app/views/seminar_p.html.erb
-33
View File
@@ -1,33 +0,0 @@
<div id="seminar_p">
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<span class="thmtxth">Seminar</span>
</div>
<div id="search_app" class="hfn w2 hh2 hp thmc3">
<input type="text" class="ini_input form" value="Search" id="searchbox" />
<input type="submit" class="ini_input submit thmc1" value="Submit"/>
</div>
</div>
<div id="holder">
<div id="panel_l" class="ph">
<div class="s_menu sm_v">
<ul id='setting_left_nav'>
<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
<li><a href="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Books</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Export</a></li>
</ul>
</div>
</div>
<div id="panel_r" class="ph pw admbg hp">
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>
app/views/shared/attribute_field/_address_modal_dialog.html.erb
+1 -1
View File
@@ -56,7 +56,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true"><%=t("modal.close")%></button>
<button class="btn" data-dismiss="modal" aria-hidden="true"><%=t(:close)%></button>
<button href="" class="btn btn-primary bt-save" data-dismiss="modal" aria-hidden="true"><%=t("modal.save_and_close")%></button>
</div>
</div>
app/views/shared/attribute_field/_attribute_field.html.erb
+17 -17
View File
@@ -3,19 +3,19 @@
<button class="onoff pull-right <%= attribute_field.disabled ? 'disabled' : ''%>">ON</button>
<%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","disabled",:value=>attribute_field.disabled,:class=>"attribute_field_disabled"%>
<%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%>
<a class="btn btn-small pull-right btn-danger remove_attribute" href="#"><i class="icon-trash icon-large"></i> <%= t("delete")%></a>
<a class="btn btn-small pull-right btn-danger remove_attribute" href="#"><i class="icon-trash icon-large"></i> <%= t(:delete_)%></a>
<div class="clear">
<div class="control-group pull-left">
<label class="control-label" for="key"><%= t("admin.key") %></label>
<label class="control-label" for="key"><%= t(:key) %></label>
<div class="multipleInput">
<div class="controls">
<%= text_field "info[attribute_fields][#{attribute_field_counter}]","key",:value=>attribute_field.key%>
</div>
</div>
</div>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.name"),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
<div class="control-group pull-left">
<label class="control-label" for=""><%= t("admin.infos.type")%></label>
<label class="control-label" for=""><%= t(:type)%></label>
<div class="controls">
<%#= select_tag "info[attribute_fields][#{attribute_field_counter}][markup]" do %>
<select class="dataType" name=<%= "info[attribute_fields][#{attribute_field_counter}][markup]"%>>
@@ -30,15 +30,15 @@
<div class="<%= attribute_field.disabled ? 'hide' : ''%>">
<%= content_tag :div,:class=>show_type_panel(attribute_field,"typeA") do%>
<div class="control-group">
<label class="control-label"><%= t("admin.infos.options")%></label>
<label class="control-label"><%= t(:options)%></label>
<div class="controls">
<label class="checkbox inline">
<%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeA][cross_lang]","true",attribute_field["typeA"]["cross_lang"]) %>
<%= t("admin.infos.cross_lang")%>
<%= t(:cross_lang)%>
</label>
<label class="checkbox inline">
<%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeA][add_more]","true",attribute_field["typeA"]["add_more"]) %>
<%= t("admin.infos.add_more")%>
<%= t(:add_more)%>
</label>
</div>
</div>
@@ -46,7 +46,7 @@
<% end %>
<%= content_tag :div,:class=>show_type_panel(attribute_field,"typeB") do %>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t("admin.infos.initial"),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>
<%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>
<% if attribute_field.self_defined_markup_options?%>
<%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][attribute][role][statuses]"} %>
@@ -57,41 +57,41 @@
<% end %>
<%= content_tag :div,:class=>show_type_panel(attribute_field,"typeC") do %>
<div class="control-group">
<label class="control-label"><%= t("admin.infos.date.format")%></label>
<label class="control-label"><%= t("date.format")%></label>
<div class="controls">
<%= select "info[attribute_fields][#{attribute_field_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t("admin.infos.date.range")%></label>
<label class="control-label"><%= t("date.range")%></label>
<div class="controls">
<label class="radio inline">
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (!attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.not_range")%>
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (!attribute_field.date_is_range? ? true : false)) %><%= t(:yes_)%>
</label>
<label class="radio inline">
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.is_range")%>
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field.date_is_range? ? true : false)) %><%= t(:no_)%>
</label>
</div>
</div>
<div class="control-group">
<label class="control-label"><%= t("admin.infos.date.claendar")%></label>
<label class="control-label"><%= t("date.calendar")%></label>
<div class="controls">
<label class="radio inline">
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "claendar", "west_claendar",:checked =>(attribute_field["typeC"]["claendar"]== "west_claendar" ? true : false)) %><%= t("admin.infos.date.west_claendar")%>
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "calendar", "west_calendar",:checked =>(attribute_field["typeC"]["calendar"]== "west_calendar" ? true : false)) %><%= t("date.west_calendar")%>
</label>
<label class="radio inline">
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "claendar", "tw_claendar",:checked =>(attribute_field["typeC"]["claendar"]== "tw_claendar" ? true : false)) %><%= t("admin.infos.date.tw_claendar")%>
<%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "calendar", "tw_calendar",:checked =>(attribute_field["typeC"]["calendar"]== "tw_calendar" ? true : false)) %><%= t("date.tw_calendar")%>
</label>
</div>
</div>
<% end %>
<%= content_tag :div,:class=>show_type_panel(attribute_field,"typeD") do%>
<div class="control-group">
<label class="control-label"><%= t("admin.infos.options")%></label>
<label class="control-label"><%= t(:options)%></label>
<div class="controls">
<label class="checkbox inline">
<%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeD][cross_lang]","true",attribute_field["typeD"]["cross_lang"]) %>
<%= t("admin.infos.cross_lang")%>
<%= t(:cross_lang)%>
</label>
</div>
</div>
app/views/shared/attribute_field/_list_block.html.erb
+2 -2
View File
@@ -2,7 +2,7 @@
<div class="control-group">
<%= hidden_field_tag "#{temp_field_name}[count]",((values.keys.collect{|t| t.to_i}.max rescue nil) || 0 ),:class=>"list_count"%>
<%= hidden_field_tag "#{temp_field_name}[name]",field_name,:class=>"field_name"%>
<label class="control-label" ><%= t("admin.infos.list")%></label>
<label class="control-label" ><%= t(:list)%></label>
<div class="multipleInput">
<%if values.blank? %>
<div class="controls">
@@ -39,7 +39,7 @@
</div>
<div class="controls">
<span class="help-block">
<a href="#"><i class="icon-plus-sign"></i><%= t("admin.infos.add") %></a>
<a href="#"><i class="icon-plus-sign"></i><%= t(:add) %></a>
</span>
</div>
</div>
app/views/shared/attribute_field/_placeholder_block.html.erb
+1 -1
View File
@@ -1,6 +1,6 @@
<% values ||=[]%>
<%= content_tag :div,:class=>"control-group language-swich #{class_ext rescue "" }" do%>
<label class="control-label" for=""><%= (defined? label_ext) ? label_ext : t("admin.infos.placeholder") %></label>
<label class="control-label" for=""><%= (defined? label_ext) ? label_ext : t(:placeholder) %></label>
<div class="controls">
<div class="tabbable">
<div class="tab-content">
app/views/shared/preview/_modal_preview.html.erb
+2 -2
View File
@@ -1,7 +1,7 @@
<div class="modal hide fade in banner-preview" id="<%= @preview_obj.id %>">
<div class="modal-header">
<a class="close" data-dismiss="modal">×</a>
<h3><%= t("modal.preview") %></h3>
<h3><%= t(:preview) %></h3>
</div>
<div class="modal-body">
<p class="">
@@ -16,7 +16,7 @@
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
<a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
</div>
<div>
<script type="text/javascript" src="/static/kernel.js"></script>