@@ -101,7 +101,7 @@
-
+
<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
@@ -111,7 +111,7 @@
-
+
<%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
@@ -121,7 +121,7 @@
-
+
<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index 3040f8725..c67ade0e4 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -2,7 +2,7 @@
<%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %>
<%= asset.title rescue nil %>
-
+
<%= link_to t(:edit), edit_admin_asset_path(asset), :remote => true, :class => 'edit' %>
diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb
index 1cb360881..b0f114742 100644
--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@@ -3,7 +3,7 @@
<% end -%>
-
<%= t(:content) %>
+
<%= t(:content) %>
<%= t(:all_content) %> <%= @module_app_contents_total %>
@@ -445,7 +445,7 @@
-
<%= t(:traffic) %>
+
<%= t(:traffic) %>
<%= t(:total_visitors) %> <%= display_visitors %>
@@ -493,7 +493,7 @@
-
<%= t(:recent_update) %>
+
<%= t(:recent_update) %>
@@ -530,7 +530,7 @@
-
<%= t(:most_visited_page) %>
+
<%= t(:most_visited_page) %>
diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb
new file mode 100644
index 000000000..4a9eaa12f
--- /dev/null
+++ b/app/views/admin/module_store/index.html.erb
@@ -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' %>
+
+<% end %>
+
+
+
+
+
+
+ <% 9.times do %>
+
+ <% end %>
+
+
+
\ No newline at end of file
diff --git a/app/views/admin/module_store/show.html.erb b/app/views/admin/module_store/show.html.erb
new file mode 100644
index 000000000..64e88d028
--- /dev/null
+++ b/app/views/admin/module_store/show.html.erb
@@ -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' %>
+
+<% end %>
+
+
+
+
+ <%= image_tag 'modulestore/app-icon.jpg', :class => "app-icon" %>
+
Free download
+
+
+
+
+
+
Orbit app name here
+
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
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/admin/plugins/index.html.erb b/app/views/admin/plugins/index.html.erb
index 9e6496771..db5b75b3f 100644
--- a/app/views/admin/plugins/index.html.erb
+++ b/app/views/admin/plugins/index.html.erb
@@ -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 %>
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index a35eef329..67b7c6619 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/app/views/admin/sites/_side_bar.html.erb
@@ -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 -%>
diff --git a/app/views/admin/template_store/index.html.erb b/app/views/admin/template_store/index.html.erb
new file mode 100644
index 000000000..0599c44cf
--- /dev/null
+++ b/app/views/admin/template_store/index.html.erb
@@ -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 %>
+
+
+
+
+
+ <% 9.times do %>
+
+ <% end %>
+
+
+
+
+
diff --git a/app/views/admin/template_store/show.html.erb b/app/views/admin/template_store/show.html.erb
new file mode 100644
index 000000000..1a3e37d70
--- /dev/null
+++ b/app/views/admin/template_store/show.html.erb
@@ -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' %>
+
+<% end %>
+
+
+
+
+
+ <%= image_tag 'templatestore/template-icon.jpg', :class => "template-icon" %>
+
Free download
+
+
+
+
+
+
Orbit Template name here
+
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
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/admin/users_new_interface/_plugin_summary.html.erb b/app/views/admin/users_new_interface/_plugin_summary.html.erb
index 09871ad83..4db0b9229 100644
--- a/app/views/admin/users_new_interface/_plugin_summary.html.erb
+++ b/app/views/admin/users_new_interface/_plugin_summary.html.erb
@@ -1,5 +1,5 @@
-
Module Name
+
Module Name
diff --git a/app/views/admin/users_new_interface/edit.html.erb b/app/views/admin/users_new_interface/edit.html.erb
index 7a0b82995..60ed1d05f 100644
--- a/app/views/admin/users_new_interface/edit.html.erb
+++ b/app/views/admin/users_new_interface/edit.html.erb
@@ -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('admin.user'), :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 -%>
diff --git a/app/views/admin/users_new_interface/index.html.erb b/app/views/admin/users_new_interface/index.html.erb
index 58f4f0aa4..cb1c6594e 100644
--- a/app/views/admin/users_new_interface/index.html.erb
+++ b/app/views/admin/users_new_interface/index.html.erb
@@ -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('admin.user'), :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"%>
diff --git a/app/views/admin/users_new_interface/index_summary.html.erb b/app/views/admin/users_new_interface/index_summary.html.erb
index 5de99bb37..38812d018 100644
--- a/app/views/admin/users_new_interface/index_summary.html.erb
+++ b/app/views/admin/users_new_interface/index_summary.html.erb
@@ -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('admin.user'), :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"%>
diff --git a/app/views/admin/users_new_interface/index_thumbnail.html.erb b/app/views/admin/users_new_interface/index_thumbnail.html.erb
index 3f07dbe7f..73794ea60 100644
--- a/app/views/admin/users_new_interface/index_thumbnail.html.erb
+++ b/app/views/admin/users_new_interface/index_thumbnail.html.erb
@@ -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('admin.user'), :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"%>
diff --git a/app/views/admin/users_new_interface/new.html.erb b/app/views/admin/users_new_interface/new.html.erb
index 108e9a085..7d27e5c2e 100644
--- a/app/views/admin/users_new_interface/new.html.erb
+++ b/app/views/admin/users_new_interface/new.html.erb
@@ -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('admin.user'), :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 -%>
diff --git a/app/views/admin/users_new_interface/plugin_dashbroad.html.erb b/app/views/admin/users_new_interface/plugin_dashbroad.html.erb
index 3dc728197..b2552719b 100644
--- a/app/views/admin/users_new_interface/plugin_dashbroad.html.erb
+++ b/app/views/admin/users_new_interface/plugin_dashbroad.html.erb
@@ -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('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb
index a5813fff6..7fb825f59 100644
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/app/views/admin/users_new_interface/show.html.erb
@@ -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('admin.user'), :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"%>
diff --git a/app/views/admin/users_new_interface/temp_edit.html.erb b/app/views/admin/users_new_interface/temp_edit.html.erb
index ac81ef48a..45f2cd6ff 100644
--- a/app/views/admin/users_new_interface/temp_edit.html.erb
+++ b/app/views/admin/users_new_interface/temp_edit.html.erb
@@ -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('admin.user'), :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 -%>
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index b3f78780e..c90f53fdd 100755
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -5,13 +5,13 @@
-
+
diff --git a/app/views/desktop/journal_p.html.erb b/app/views/desktop/journal_p.html.erb
index 87cf8a17e..e6b455a0c 100644
--- a/app/views/desktop/journal_p.html.erb
+++ b/app/views/desktop/journal_p.html.erb
@@ -14,9 +14,9 @@
-
- <% end %>
-
-
-
-
\ No newline at end of file
+
+ <%= t(:or_lower) %>
+ <% end %>
+
+ <%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
+
+
+ <% end %>
+
+
+
+
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 32876b9fc..dbe735485 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -1,6 +1,6 @@
- <%= 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('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
diff --git a/app/views/layouts/_side_bar_content.html.erb b/app/views/layouts/_side_bar_content.html.erb
index f2656bd10..401e18519 100644
--- a/app/views/layouts/_side_bar_content.html.erb
+++ b/app/views/layouts/_side_bar_content.html.erb
@@ -7,7 +7,7 @@
<% end %>
<%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') || active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
- <%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
+ <%= link_to content_tag(:i, nil, :class => 'icons-megaphone') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
<%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index')if (is_manager? rescue nil) %>
<%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
@@ -34,7 +34,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banner') do -%>
- <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
+ <%= link_to content_tag(:i, nil, :class => 'icons-landscape') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
@@ -57,7 +57,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('albums','album_images','gallery_categories','/panel/gallery/back_end/tags') || active_for_app_auth("gallery") do -%>
- <%= link_to content_tag(:i, nil, :class => 'icons-picture') + content_tag(:span, t('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
+ <%= link_to content_tag(:i, nil, :class => 'icons-pictures') + content_tag(:span, t('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('albums') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
@@ -69,7 +69,7 @@
<% end %>
<%= content_tag :li, :class => active_for_controllers('archive_files', 'panel/archive/back_end/tags', 'archive_file_categorys') do -%>
- <%= link_to content_tag(:i, nil, :class => 'icons-asset') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
+ <%= link_to content_tag(:i, nil, :class => 'icons-archive') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
<%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index')if (is_manager? rescue nil) %>
<%= content_tag :li, link_to((t('admin.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') if (is_admin? rescue nil)%>
@@ -90,7 +90,7 @@
<% end -%>
<% end %>
<%= content_tag :li, :class => active_for_controllers('locations') || active_for_app_auth("gprs") do -%>
- <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
+ <%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('locations') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
diff --git a/config/application.rb b/config/application.rb
index f0e40fcca..0898a2e67 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -68,6 +68,10 @@ module Orbit
config.assets.enabled = true
#config.time_zone = 'Taipei'
ENV['TZ'] = 'Asia/Taipei'
+
+ config.to_prepare do
+ Devise::RegistrationsController.layout false
+ end
end
end
Orbit_Apps = []
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 817f12ea0..3264bcd97 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -109,7 +109,6 @@ Devise.setup do |config|
# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you
# are using only default views.
- # config.scoped_views = true
# Configure the default scope given to Warden. By default it's the first
# devise role declared in your routes.
diff --git a/config/routes.rb b/config/routes.rb
index 9b584ebec..9cf39f7f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,8 @@
Orbit::Application.routes.draw do
- devise_for :users
+ devise_for :users do
+ match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put
+ end
+
mount Resque::Server, :at => "/admin/resque"
# routes for sinatra app
@@ -138,6 +141,11 @@ Orbit::Application.routes.draw do
match 'member_select_add' => "member_selects#member_select_add" ,:as => :member_select_add,:via => "post"
end
+ match 'module_store' => 'module_store#index'
+ match 'module_store/show' => 'module_store#show'
+ match 'template_store' => 'template_store#index'
+ match 'template_store/show' => 'template_store#show'
+
end
# end admin
diff --git a/db/seeds.rb b/db/seeds.rb
index 3ecb2b43e..00825e32f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -2,6 +2,9 @@ require 'factory_girl'
require 'faker'
require 'json'
+WritingJournal.destroy_all
+CoAuthor.destroy_all
+
data = File.read("db/data")
data_json = JSON.parse(data)
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index 0151d4c02..1802db624 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -1,6 +1,7 @@
class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
include OrbitControllerLib::DivisionForDisable
- before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
+ # if someone want to use json format replace with rss, please add :get_bulletins_json to below
+ before_filter :for_app_manager,:except => [:index,:get_categorys_json]
def index
@bulletin_categorys = get_categories_for_index("BulletinCategory")
@@ -22,7 +23,15 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
categorys.each do |c|
data << {
category: c.title,
- link: "http://#{request.host_with_port}#{panel_announcement_back_end_bulletin_category_get_bulletins_json_path(c)}"
+ # this is a json format
+ # link: "http://#{request.host_with_port}#{panel_announcement_back_end_bulletin_category_get_bulletins_json_path(c)}"
+ # remember to uncommand a rule in route.rb, too
+ link: "#{url_for( :action => "index",
+ :controller => "panel/announcement/front_end/bulletins",
+ :format => :rss,
+ :only_path => false,
+ :inner=>true,
+ :category_id => c )}"
}
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index 8fa7af685..456d57d96 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -1,10 +1,10 @@
class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
-
+
def initialize
super
@app_title = 'announcement'
end
-
+
# GET /bulletins
# GET /bulletins.xml
def index_bulletins_by_unit
@@ -14,14 +14,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end
def index
- @item = Page.find(params[:page_id])
-
- if @item.frontend_data_count
- @page_num = @item.frontend_data_count
- else
- @page_num = 15
- end
- @frontend_style = @item.frontend_style
+ @item = Page.find(params[:page_id]) rescue nil
+ if @item
+ if @item.frontend_data_count
+ @page_num = @item.frontend_data_count
+ else
+ @page_num = 15
+ end
+ @frontend_style = @item.frontend_style
+ end
@page = Page.find(params[:page_id]) rescue nil
if !params[:search_query].blank?
@@ -54,9 +55,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end
impressionist(@tag) if @tag
end
-
+
end
-
+
def show
@page = Page.find(params[:page_id]) rescue nil
if params[:preview] == "true"
@@ -71,22 +72,22 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
render :text => "
#{t('sys.can_not_display_due_to_no_context')}
".html_safe
end
else
- render :nothing => true, :status => 403
+ render :nothing => true, :status => 403
end
end
end
-
+
def preview_content
@bulletin = Bulletin.find params[:id] rescue nil
@bulletin = Preview.find(params[:id]).get_virtual_object if @bulletin.nil?
get_categorys
end
-
+
protected
-
+
def get_categorys
@bulletin_categorys = BulletinCategory.all
end
-
+
end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 2e27bb024..44d5956ea 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -11,7 +11,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
<%= t(:start) %>
@@ -65,7 +65,7 @@
-
+
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -89,7 +89,7 @@
-
+
<%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
@@ -99,7 +99,7 @@
-
+
<% @tags.each do |tag| %>
@@ -186,7 +186,7 @@
-
+
@@ -230,7 +230,7 @@
-
+
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
index ca4719c6f..40698bfc5 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
@@ -1,13 +1,13 @@
xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
- if @current_category
- xml.title @current_category.title_translations[I18n.locale.to_s]
- else
- xml.title t('announcement.announcement')
- end
+ if @current_category
+ xml.title @current_category.title_translations[I18n.locale.to_s]
+ else
+ xml.title t('announcement.announcement')
+ end
xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true)
-
+
for bulletin in @bulletins
xml.item do
xml.title bulletin.title_translations[I18n.locale.to_s]
@@ -18,4 +18,4 @@ xml.rss :version => "2.0" do
end
end
end
-end
\ No newline at end of file
+end
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 35500ac3e..8c11ebd05 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
match 'approval_setting' => "approvals#setting" ,:as => :approval_setting,:via => :get
match 'approval_setting' => "approvals#update_setting" ,:as => :approval_setting,:via => :post
match 'approval_setting' => "approvals#user_list" ,:as => :approval_user_list,:via => :put
- #match 'get_bulletins_json' => "bulletins#get_bulletins_json" ,:as => :bulletins_json_list,:via => :get
+
resources :bulletins do
match "approve/:bulletin_id" => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
match "approve/:bulletin_id" => "approvals#approve",:as => :approve,:via => :post
@@ -29,7 +29,9 @@ Rails.application.routes.draw do
collection do
get 'get_categorys_json'
end
- match "get_bulletins_json/" => "bulletin_categorys#get_bulletins_json", :as => :get_bulletins_json
+ # if want to use json
+ # please uncommand below line
+ # match "get_bulletins_json/" => "bulletin_categorys#get_bulletins_json", :as => :get_bulletins_json
end
resources :bulletin_links, :controller => 'bulletin_links' do
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
index bd080e1e5..1314a7c41 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<%= f.check_box :is_top %><%= t('top') %>
@@ -24,7 +24,7 @@
-
+
<% @tags.each do |tag| %>
<%= check_box_tag 'archive_file[tag_ids][]', tag.id, @archive_file.tag_ids.include?(tag.id)%>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
index 7cec450f5..cb6f342f6 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @author_types.each do |author_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -27,7 +27,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
index 8b0d01325..f9cd05f0b 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @author_types.each do |author_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -27,7 +27,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
index 481173b76..45e207e89 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
index 881302d9b..9dd062d23 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
index 7989dda8d..f275c346d 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
index 9e734b307..f2156d5cf 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
index 0ce7b634e..f0bdcf510 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
index a8e13d911..99761d827 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
index 49dc00154..f91277586 100644
--- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
+++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
@@ -35,9 +35,26 @@ class WritingJournal
accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true
after_save :save_writing_journal_files
before_validation :add_http
+ before_save :save_co_author
validates :paper_title, :at_least_one => true
validates :url, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :unless => Proc.new{self.url.blank?}
+ def save_co_author
+ authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? }
+ if new_record?
+ current_user = create_user_id
+ else
+ current_user = update_user_id
+ end
+
+ authors_db = CoAuthor.where(:name_id => current_user).map(&:co_author)
+ authors_list.delete(User.find(current_user).name)
+ authors_list = authors_list.delete_if{|author| authors_db.include?author}
+ authors_list.each do |author|
+ CoAuthor.new(:co_author => author, :name_id => current_user).save
+ end
+ end
+
def self.search( category_id = nil )
if category_id.to_s.size > 0
find(:all, :conditions => {writing_journal_category_id: category_id}).desc( :is_top, :title )
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
index 041270021..6f7675024 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<%= f.text_area :abstract, :size => "60x3" %>
@@ -20,7 +20,7 @@
-
+
<%= f.text_area :note, :size => "60x3" %>
@@ -31,7 +31,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
index a2502adb1..b60bcd591 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @level_types.each do |level_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
-
+
<% @author_types.each do |author_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
index 8fce24c13..a0dc233d0 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
index 2100ea79b..68ef9b97c 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
index d2df79702..d92f08fc9 100644
--- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
index d2df79702..d92f08fc9 100644
--- a/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
index 9ac672a44..372e8a565 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
index de318a705..8306b6be2 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
index 8c33836bc..9f6612dbd 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
index c2dd1c80b..85ff54dfe 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
index 1e0308389..4f6f139b1 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
index 2d9a02ac8..0b3cefdc2 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_form.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_form.html.erb
index 00a30b3f8..2f045c9be 100644
--- a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_form.html.erb
+++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @paper_types.each do |paper_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
-
+
<% @author_types.each do |author_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_form.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_form.html.erb
index 948e54fa7..7d80998a7 100644
--- a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_form.html.erb
+++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% @paper_types.each do |paper_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
-
+
<% @author_types.each do |author_type| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
index 4abd3d9a1..4ce2d2edb 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
@@ -11,7 +11,7 @@
-
+
<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -34,7 +34,7 @@
-
+
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>