member list edit

app/controllers/admin/plugins_controller.rb

@@ -7,7 +7,17 @@ class Admin::PluginsController < ApplicationController
     @plugins = OrbitApp::Module::Registration.all
 
     if(!params[:show_plugin_profile].nil?)
-      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary'
+	
+      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).admin_partial_path
+
+	  if !@right_partial.blank?
+	    respond_to do |format|
+	      format.html { redirect_to( @right_partial ) }
+        end
+      else
+	    @right_partial = "admin/users_new_interface/plugin_summary"
+	  end
+	  
     else
       @right_partial = "admin/users_new_interface/plugin_summary"
     end

app/views/admin/attributes/edit.html.erb

@@ -9,6 +9,20 @@
                                         <div class="form-horizontal">
                         <div class="clear">
 							
+                            <div class="control-group pull-left">
+                                <label class="control-label" for="key"><%= t(:key) %></label>
+                                <div class="controls">
+                                    <% if @attribute.new_record? %>
+                                        <%= 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(:item_name),:field_name=>"#{@attribute_type}[title_translations]"}%>
+							
+							
+						
                             <div class="control-group pull-left">
                                 <label class="control-label" for="key"><%= t(:to_search) %></label>
                                 <div class="controls">
@@ -23,24 +37,13 @@
                                 </div>
                             </div>
 							
-                            <div class="control-group pull-left">
-                                <label class="control-label" for="key"><%= t(:key) %></label>
-                                <div class="controls">
-                                    <% if @attribute.new_record? %>
-                                        <%= 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(:item_name),:field_name=>"#{@attribute_type}[title_translations]"}%>
                         </div>
                     </div>
                 </div>
 						<% if @attribute._type == "Info" %>
 						
 						<div class="map-block back attributes">
-							<h4><span><%=  @attribute.title+ t(:attributes)%></span></h4>
+							<h4><span><%=  @attribute.title+ t(:field)%></span></h4>
 							<div id="attribute_field_list">
 							<%= render :partial=>"shared/attribute_field/attribute_field",:collection=>@attribute.attribute_fields%>
 							</div>

app/views/admin/plugins/_plugin_list.html.erb

@@ -0,0 +1,18 @@
+			<div id="module-nav">
+                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
+                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
+                <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(:all_plugin_summary)%>
+                        <% end -%>
+                        <% @plugins.each do |plugin| %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
+                                <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.name) %>
+                            <% end -%>    
+                        <% end -%>
+
+
+                    </ul>
+                </div>
+            </div>

app/views/admin/plugins/index.html.erb

@@ -4,23 +4,6 @@
 
 
         <div id="isotope" class="user-data">
-            <div id="module-nav">
+            <%= render :partial => 'plugin_list' %>
-                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
-                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
-                <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(:all_plugin_summary)%>
-                        <% end -%>
-                        <% @plugins.each do |plugin| %>
-                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
-                                <%= link_to plugin.name, :show_plugin_profile => plugin.name %>
-                            <% end -%>    
-                        <% end -%>
-
-
-                    </ul>
-                </div>
-            </div>
             <%= render :partial => @right_partial %>
         </div>

app/views/admin/roles/_attribute_field.html.erb

@@ -10,6 +10,17 @@
           <%= hidden_field "#{@field_name}[attribute_fields][#{@af_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%>
           <a class="btn btn-small pull-right btn-danger remove_attribute"><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(:key) %></label>
+                  <div class="multipleInput">
+                      <div class="controls">
+                        <%= text_field "#{@field_name}[attribute_fields][#{@af_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(:name),:field_name=>"#{@field_name}[attribute_fields][#{@af_counter}][title_translations]"}%>
+			  
+			  
 				<div class="control-group">
 					<label class="control-label" for="key"><%= t(:to_search) %></label>
 					<div class="controls">
@@ -21,15 +32,8 @@
 						</label> 
 					</div>
 				</div>
-              <div class="control-group pull-left">
+				
-                  <label class="control-label" for="key"><%= t(:key) %></label>
+				
-                  <div class="multipleInput">
-                      <div class="controls">
-                        <%= text_field "#{@field_name}[attribute_fields][#{@af_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(:name),:field_name=>"#{@field_name}[attribute_fields][#{@af_counter}][title_translations]"}%>
               <div class="control-group pull-left">
                   <label class="control-label" for=""><%= t(:type)%></label>
                   <div class="controls">
@@ -46,7 +50,7 @@
       <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(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                             <%= check_box_tag("#{@field_name}[attribute_fields][#{@af_counter}][typeA][cross_lang]","true",attribute_field["typeA"]["cross_lang"]) %>
@@ -103,7 +107,7 @@
           <% end %>
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeD") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                         <%= check_box_tag("#{@field_name}[attribute_fields][#{@af_counter}][typeD][cross_lang]","true",attribute_field["typeD"]["cross_lang"]) %>

app/views/admin/roles/edit_sub_role.html.erb

@@ -5,6 +5,18 @@
                                         <div class="form-horizontal">
                         <div class="clear">
 							
+                            <div class="control-group pull-left">
+                                <label class="control-label" for="key"><%= t(:key) %></label>
+                                <div class="controls">
+                                    <% if @sub_attribute.new_record? %>
+                                        <%= f.text_field :key, :placeholder => t(:key) %>
+                                    <% else %>
+                                        <div><%= @sub_attribute.key%></div>
+                                    <% end %>
+                                </div>
+                            </div>
+                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@sub_attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"sub_role[title_translations]"}%>
+						
                             <div class="control-group pull-left">
                                 <label class="control-label" for="key"><%= t(:to_search) %></label>
                                 <div class="controls">
@@ -19,17 +31,6 @@
                                 </div>
                             </div>
 							
-                            <div class="control-group pull-left">
-                                <label class="control-label" for="key"><%= t(:key) %></label>
-                                <div class="controls">
-                                    <% if @sub_attribute.new_record? %>
-                                        <%= f.text_field :key, :placeholder => t(:key) %>
-                                    <% else %>
-                                        <div><%= @sub_attribute.key%></div>
-                                    <% end %>
-                                </div>
-                            </div>
-                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@sub_attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"sub_role[title_translations]"}%>
                         </div>
                     </div>
                 </div>

app/views/admin/roles/role_field.html.erb

@@ -6,7 +6,7 @@
             <div class="site-map role-block">
                 
 				<div class="map-block back attributes">
-					<h4><span><%=  @attribute.title+ t(:attributes)%></span></h4>
+					<h4><span><%=  @attribute.title + t(:role)%></span></h4>
 					<div id="attribute_field_list">
 					<%= render :partial=>"attribute_field",:collection=>@attribute.attribute_fields%>
 					</div>

app/views/admin/roles/sub_role.html.erb

@@ -56,5 +56,5 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i,t(:new_sub_role),:class=>"icon-plus icon-white"),eval("admin_#{@attribute_type}_add_sub_role_path(@attribute)"),:class=>"btn btn-primary pull-right"%>
+	<%= link_to content_tag(:i,t("new.sub_role"),:class=>"icon-plus icon-white"),eval("admin_#{@attribute_type}_add_sub_role_path(@attribute)"),:class=>"btn btn-primary pull-right"%>
 </div>

app/views/admin/roles/sub_role_field.html.erb

@@ -6,7 +6,7 @@
             <div class="site-map role-block">
                 
 				<div class="map-block back attributes">
-					<h4><span><%=  @attribute.title+ t(:attributes)%> - <%=  @sub_attribute.title %></span></h4>
+					<h4><span><%=  @attribute.title+ t(:role)%> - <%=  @sub_attribute.title %></span></h4>
 					<div id="attribute_field_list">
 					<%= render :partial=>"attribute_field",:collection=>@sub_attribute.attribute_fields%>
 					</div>

app/views/admin/users_new_interface/_side_bar.html.erb

@@ -3,16 +3,24 @@
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
       <%= 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') if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:roles) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_registration) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:authorigation) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_role) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:registrant) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) %>
     <% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t(:analysis)), admin_plugins_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-graduation')+ content_tag(:span, t(:academic_info)), admin_plugins_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
-      <%= 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') %>
+      <%= content_tag :li, link_to((t(:list_) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', '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(:analysis)), '#' %>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-layout')+ content_tag(:span, t(:groups)), '#' %>
+<% end -%>

app/views/admin/users_new_interface/_user_for_listing.html.erb

@@ -2,10 +2,11 @@
                     <td class="span1"><% if is_admin? %><input type="checkbox"><% end%></td>
                     <td class="span3">
                         <div class="label-group">
-                            <div class="label-td"><!-- 
+                            <div class="label-td">
-                                <span class="label label-teacher"># TODO:Teacher</span>
+							<% user_for_listing.roles.each do |rf| %>
-                                <span class="label label-student"># TODO:Student</span>
+							<% @roledata = Role.find(rf.id) %>
-                                <span class="label label-staff"># TODO:Staff</span> -->
+							<span class="label label-<%= @roledata.key %>"><%= @roledata.title %></span>
+							<% end %>
                             </div>
                         </div>
                     </td>

app/views/admin/users_new_interface/edit.html.erb

@@ -21,6 +21,7 @@
 
     <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
       <%= f.error_messages %>
+      <%= render :partial => 'user_basic', :locals => {:f => f}%>
       <%= render :partial => 'form', :locals => { :f => f } %>
       <div class="button_bar">
         <%= link_back %>

app/views/shared/attribute_field/_attribute_field.html.erb

@@ -10,6 +10,17 @@
           <%= hidden_field "info[attribute_fields][#{@af_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%>
           <a class="btn btn-small pull-right btn-danger remove_attribute"><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(:key) %></label>
+                  <div class="multipleInput">
+                      <div class="controls">
+                        <%= text_field "info[attribute_fields][#{@af_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(:name),:field_name=>"info[attribute_fields][#{@af_counter}][title_translations]"}%>
+			  
+			  
 				<div class="control-group">
 					<label class="control-label" for="key"><%= t(:to_search) %></label>
 					<div class="controls">
@@ -21,15 +32,7 @@
 						</label> 
 					</div>
 				</div>
-              <div class="control-group pull-left">
+				
-                  <label class="control-label" for="key"><%= t(:key) %></label>
-                  <div class="multipleInput">
-                      <div class="controls">
-                        <%= text_field "info[attribute_fields][#{@af_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(:name),:field_name=>"info[attribute_fields][#{@af_counter}][title_translations]"}%>
               <div class="control-group pull-left">
                   <label class="control-label" for=""><%= t(:type)%></label>
                   <div class="controls">
@@ -46,7 +49,7 @@
       <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(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                             <%= check_box_tag("info[attribute_fields][#{@af_counter}][typeA][cross_lang]","true",attribute_field["typeA"]["cross_lang"]) %>
@@ -103,7 +106,7 @@
           <% end %>
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeD") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                         <%= check_box_tag("info[attribute_fields][#{@af_counter}][typeD][cross_lang]","true",attribute_field["typeD"]["cross_lang"]) %>

app/views/shared/attribute_field/_list_block.html.erb

@@ -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(:list_)%></label>
+                  <label class="control-label" ><%= t(:options)%></label>
                   <div class="multipleInput">
                     <%if values.blank? %>
                         <div class="controls">

config/locales/en.yml

@@ -11,6 +11,7 @@ en:
       object: Access Denied for you don't have permission for this object
       not_admin: Access Denied for you are not Admin
   account_settings: Account settings  
+  academic_info: Academic Info.
   action: Action
   ad:
     chinese_1: 在套圖中出現次數 1次請輸入1
@@ -40,8 +41,8 @@ en:
   add_attribute_field: Add attribute field
   add_image: Add image
   add_item: Add item
-  add_member: Add member
+  add_member: Create New Member
-  add_more: Add more
+  add_more: Exteudable Field
   address_modal:
     default_title: Address
     street_address: Street address
@@ -55,7 +56,7 @@ en:
   all: All
   all_content: All Content
   all_file: All File
-  all_member: All Member
+  all_member: Member List
   all_plugin_summary: All plugin summary
   all_plugins: All plugins
   always_display_title: Always displayed in the title bar
@@ -126,20 +127,20 @@ en:
       paper: Paper was successfully created.
       user: User was successfully created.
   create_: Create
-  cross_lang: 跨語言輸入
+  cross_lang: Enable Monolingual
   data: Data
   date:
-    calendar: 紀年法
+    calendar: Calendar Era
-    range: 本欄為時間區段
+    range: Enable Time Period
     format: 格式
-    tw_calendar: 民國
+    tw_calendar: R.O.C Year.
     minguo_calendar: 
       after: 民國
       before: 民前
       first_year: 民國元年
-      year: 年
+      year: Year
-      month: 月
+      month: Month
-    west_calendar: 西元
+    west_calendar: A.C.
   date_: Date
   dashboard:
     bulletin: Announcement
@@ -177,6 +178,7 @@ en:
   end_date: End date
   errors:
     at_least_one: must at least have one value
+  field: Fields
   file: 
     size: File size
     type: File type
@@ -188,6 +190,7 @@ en:
   frequency: Frequency
   frontend_data_count: Frontend data count
   gallery: Gallery
+  groups: Groups
   help: Help
   hidden: Hidden
   hide: Hide
@@ -198,13 +201,13 @@ en:
   image: Image
   images: Images
   info: Information
-  initial: 起始值
+  initial: Default Value
   intro: Introduction
   is_published: Is published
   item: Item
-  item_name: Item name
+  item_name: Name
   javascripts: Javascripts
-  key: Key
+  key: Index Keys
   last_modified: Last modified
   layout: Layout
   link: Link
@@ -247,6 +250,10 @@ en:
   markup_value: Markup value
   me: Me
   member: Member
+  member_authorization: Authorizations
+  member_info: Profile Form
+  member_registration: Registration Approval
+  member_role: Member Roles
   menu_enabled_for: Menu enabled for
   module: Module
   module_authorization: Module Authorization
@@ -265,7 +272,8 @@ en:
     page: New page
     user: New user
     info: New user information
-    role: New user role
+    role: New role
+    sub_role: New sub role
   new_: New
   news: News
   no_: "No"
@@ -291,7 +299,7 @@ en:
   password_current: Current password
   pending: Pending
   picture: Picture
-  placeholder: Placeholder
+  placeholder: Field Hint
   plugins: Plugins
   postdate: Postdate
   posted_by: Posted by
@@ -310,6 +318,7 @@ en:
   rejected_reason_empty:  "Approval rejected, no referencable information" 
   related_links: Related Links
   role: Role
+  role_field: Role Field
   Roles: Roles
   ruling_site: Ruling Site
   search:
@@ -355,6 +364,8 @@ en:
   status: Status
   structure: Structure
   sub_manager: SubManager
+  sub_role: Sub Role
+  sub_role_field: Sub Role Field
   subtitle: Subtitle
   submit: Submit
   submit_approval: Submit approval
@@ -376,10 +387,11 @@ en:
   theme: Theme
   themes: Themes
   title: Title
+  to_search: Set as Search Key
   top: Top
   total_visitors: Total Visitors
   traffic: Traffic
-  type: Type
+  type: Field Type
   unit_name: Unit name
   unzip_success: "App unzip procress is finished, please restart the server to apply effect"
   up_to_date: Up-to-date

config/locales/zh_tw.yml

@@ -20,6 +20,7 @@ zh_tw:
       object: 拒絕存取，因你沒有權限
       not_admin: 拒絕存取，因你不是此應用程式管理員
   account_settings: 帳號設定
+  academic_info: 學術資訊
   action: 操作
   ad:
     ab_fx: 轉場效果
@@ -37,13 +38,34 @@ zh_tw:
     widget_info_for_ad_image_size: "此區塊圖片尺寸使用: %{best_size}"
   ad_banner: 廣告輪播
   add: 新增
+<<<<<<< HEAD
   add_item: 新增項目
+=======
+  add_attribute_field: 新增欄位
+  add_image: Add image
+  add_item: 新增項目
+  add_member: 新增成員
+  add_more: 可擴充欄位
+  address_modal:
+    default_title: 地址
+    street_address: 街道地址
+    city: 城市
+    county: 縣市
+    zip: 郵遞區號
+    country: 國家/地區
+>>>>>>> a7bc197... member list edit
   addthis_tools:
     add_to_bookmark: 加入書籤
   admin: 管理員
   all_content: 所有內容
   all_file: 所有檔案
+<<<<<<< HEAD
   all_member: 所有會員
+=======
+  all_member: 成員列表
+  all_plugin_summary: All plugin summary
+  all_plugins: All plugins
+>>>>>>> a7bc197... member list edit
   always_display_title: 永遠顯示標題
   app_auth:
     list_setting_result: 授權列表
@@ -103,7 +125,25 @@ zh_tw:
       page: 頁面已成功建立
       user: 使用者已成功建立
   create_: 建立
+<<<<<<< HEAD
   data: 資料
+=======
+  cross_lang: 啟用單語系
+  data: 資料
+  date:
+    calendar: 紀年法
+    range: 時間區段設定
+    format: 格式
+    tw_calendar: 民國
+    minguo_calendar: 
+      after: 民國
+      before: 民前
+      first_year: 民國元年
+      year: 年
+      month: 月
+    west_calendar: 西元
+  date_: Date
+>>>>>>> a7bc197... member list edit
   dashboard:
     bulletin: 公告
     news_bulletin: 新聞
@@ -162,6 +202,7 @@ zh_tw:
   end_date: 結束日期
   errors:
     at_least_one: 至少擁有一個值
+  field: 欄位
   file: 
     size: 檔案大小
     type: 檔案類型
@@ -170,6 +211,12 @@ zh_tw:
   file_type: 檔案類型
   forgot_password: 忘記密碼?
   frequency: 頻率
+<<<<<<< HEAD
+=======
+  frontend_data_count: Frontend data count
+  gallery: Gallery
+  groups: 群組
+>>>>>>> a7bc197... member list edit
   help: 幫助
   hidden: 隱藏的
   hide: 隱藏
@@ -178,10 +225,21 @@ zh_tw:
   horizontal: 水平的
   hot: 熱門
   image: 圖片
+<<<<<<< HEAD
   info: 信息
   intro: 簡介
   is_published: 已發佈
   item: 項目
+=======
+  images: Images
+  info: 基本資料
+  initial: 預設值
+  intro: 簡介
+  is_published: 已發佈
+  item: 項目
+  item_name: 名稱
+  javascripts: Javascripts
+>>>>>>> a7bc197... member list edit
   key: 索引
   last_modified: 最後修改者
   layout: 範本
@@ -229,8 +287,20 @@ zh_tw:
     user_name: 電子郵件帳號
     manager: 管理者
   manager: 管理者
+<<<<<<< HEAD
   me: 我
   member: 會員
+=======
+  markup: 輸入模式
+  markup_options: Markup options
+  markup_value: Markup value
+  me: Me
+  member: 成員
+  member_authorization: 成員權限
+  member_info: 基本資料表
+  member_registration: 註冊審核
+  member_role: 身份欄位
+>>>>>>> a7bc197... member list edit
   menu_enabled_for: 選單啟用
   modal:
     close: 關閉
@@ -251,7 +321,13 @@ zh_tw:
     page: 新增頁面
     user: 新增使用者
     info: 新增使用者資訊
+<<<<<<< HEAD
     role: 新增使用者角色
+=======
+    role: 新增身份
+    sub_role: 新增子身份
+  new_: New
+>>>>>>> a7bc197... member list edit
   news: 新聞
   no_: "不是"
   no_deadline: 沒有期限
@@ -276,6 +352,11 @@ zh_tw:
   password_current: 目前的密碼
   pending: 待審核
   picture: 圖片
+<<<<<<< HEAD
+=======
+  placeholder: 欄位提示文字
+  plugins: Plugins
+>>>>>>> a7bc197... member list edit
   postdate: 張貼日期
   posted_by: 張貼人
   preview: 預覽
@@ -290,9 +371,15 @@ zh_tw:
   rejected_reason: '拒絕原因:'
   rejected_reason_empty:  "拒絕核准, 沒有參考資訊" 
   related_links: 相關連結
+<<<<<<< HEAD
   remember_me: 記住我
   role: 角色
   Roles: 角色
+=======
+  role: 身份
+  role_field: 身份欄位
+  roles: 身份
+>>>>>>> a7bc197... member list edit
   ruling_site: 銳綸網站
   search:
     domains: Google Search Domains
@@ -333,6 +420,8 @@ zh_tw:
   status: 狀態
   structure: 結構
   sub_manager: 次管理員
+  sub_role: 子身份
+  sub_role_field: 子身份欄位
   subtitle: 副標題
   submit: 送出
   submit_approval: 送出已核准
@@ -353,10 +442,11 @@ zh_tw:
   theme: 套用頁面樣式
   themes: 主題
   title: 標題
+  to_search: 加入搜尋條件
   top: 置頂
   total_visitors: 總計造訪人次
   traffic: 流量
-  type: 類型
+  type: 欄位類型
   unit_name: 單位名稱
   up_to_date: 最新版本
   update:

lib/orbit_app/plugin/registration.rb

@@ -47,9 +47,11 @@ module OrbitApp
             @base_path = args[0][:base_path]
             @name = partial[0][:i18n].nil? ? name : lambda{ I18n.t(partial[0][:i18n]) } 
             @partial_path = ''
+            @admin_partial_path = ''
 
             unless partial.nil?
               @partial_path = partial[0][:path]
+              @admin_partial_path = partial[0][:admin_path]
             end
 
             block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
@@ -59,6 +61,10 @@ module OrbitApp
             return  @partial_path
           end
 
+          def admin_partial_path
+            return  @admin_partial_path
+          end
+    
       end
     end
   end

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
 
   def index
   
+  get_plugins
+
   get_categorys("BookPaperType",params[:book_paper_type_id])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -50,6 +52,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
 
   def writing_book_setting
   
+    get_plugins
+  
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
@@ -120,6 +124,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
   # GET /writing_books/new.xml
   def new
   
+    get_plugins
+  
     @writing_book = WritingBook.new
     # @writing_book_files = WritingBookFile.all
     # @level_types = BookLevelType.all
@@ -136,6 +142,9 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
 
   # GET /writing_books/1/edit
   def edit
+  
+    get_plugins
+	
     @writing_book = WritingBook.find(params[:id])
 	
     # @level_types = BookLevelType.all
@@ -303,6 +312,10 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id writing_book %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (writing_book.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', writing_book.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= writing_book.year %></td>
+	<td class="span1"><%= writing_book.year %></td>
-	<td>
+	<td class="span1">
 	<%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,6 +16,6 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= User.from_id(writing_book.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(writing_book.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb

@@ -1,3 +1,14 @@
+
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_book.editing_personal_book') %></h1>
 
 <%= form_for @writing_book, :url => panel_personal_book_back_end_writing_book_path(@writing_book), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb

@@ -1,12 +1,22 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_writing_books" class="sort-holder">

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb

@@ -1,10 +1,22 @@
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('writing_book.new_personal_book') %></h1>
 <%= form_for @writing_book, :url => panel_personal_book_back_end_writing_books_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_book/init.rb

@@ -2,11 +2,8 @@ module PersonalBook
   OrbitApp.registration "Book",:type=> 'ModuleApp' do
     module_label 'module_name.personal_book'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:i18n=>'module_name.personal_book'
+    personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_conference/init.rb

@@ -2,11 +2,8 @@ module PersonalConference
   OrbitApp.registration "Conference",:type=> 'ModuleApp' do
     module_label 'module_name.personal_conference'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_conference/plugin/profile",:i18n=>'module_name.personal_conference'
+    personal_plugin :enable => true,:path=>"panel/personal_seminar/plugin/profile",:admin_path=>"/panel/personal_seminar/back_end/writing_seminars",:i18n=>'module_name.personal_seminar'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb

@@ -9,6 +9,8 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   
   def index
   
+  get_plugins
+  
   @filter = params[:filter]
   new_filter = params[:new_filter]
 
@@ -40,6 +42,8 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
 
   def diploma_setting
   
+    get_plugins
+  	
     get_tags
 	
   end
@@ -58,6 +62,8 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   # GET /diplomas/new.xml
   def new
   
+    get_plugins
+  
     @diploma = Diploma.new 
 	
     get_tags
@@ -70,6 +76,9 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
 
   # GET /diplomas/1/edit
   def edit
+  
+    get_plugins
+	
     @diploma = Diploma.find(params[:id]) 
 	
     get_tags
@@ -177,6 +186,10 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_diploma'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id diploma %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (diploma.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', diploma.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %></td>
+	<td class="span1"><%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %></td>
-	<td>
+	<td class="span1">
 	<%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,6 +16,6 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= User.from_id(diploma.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(diploma.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/diploma_setting.html.erb

@@ -1,5 +1,10 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
 
 <div id="isotope">
 			

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/edit.html.erb

@@ -1,3 +1,10 @@
+
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <h1><%= t('personal_diploma.editing_personal_diploma') %></h1>
 
 <%= form_for @diploma, :url => panel_personal_diploma_back_end_diploma_path(@diploma), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/index.html.erb

@@ -1,12 +1,22 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_diplomas" class="sort-holder">
@@ -15,6 +25,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_diploma_back_end_diploma_setting_path, :class => 'btn btn-primary pull-right' %>
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path, :class => 'btn btn-primary pull-right' %>
 	<div id="diploma_pagination" class="paginationFixed">
 	<%= paginate @diplomas, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/new.html.erb

@@ -1,10 +1,18 @@
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('diploma.new_personal_diploma') %></h1>
 <%= form_for @diploma, :url => panel_personal_diploma_back_end_diplomas_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_diploma/init.rb

@@ -2,11 +2,8 @@ module PersonalDiploma
   OrbitApp.registration "Diploma",:type=> 'ModuleApp' do
     module_label 'module_name.personal_diploma'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_diploma/plugin/profile",:i18n=>'module_name.personal_diploma'
+    personal_plugin :enable => true,:path=>"panel/personal_diploma/plugin/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
 
   def index
   
+  get_plugins
+
   get_categorys("ExperienceCategory",params[:experience_category_ids])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -47,6 +49,8 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
 
   def experience_setting
   
+    get_plugins
+  
     @experience_types = ExperienceCategory.all
 	
     get_tags
@@ -92,6 +96,8 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   # GET /experiences/new.xml
   def new
   
+    get_plugins
+  
     @experience = Experience.new
     @experience_categorys = ExperienceCategory.all
 	
@@ -105,6 +111,9 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
 
   # GET /experiences/1/edit
   def edit
+  
+    get_plugins
+	
     @experience = Experience.find(params[:id])
 	
     @experience_types = ExperienceCategory.all
@@ -245,6 +254,10 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_experience'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id experience %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (experience.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', experience.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %></td>
+	<td class="span1"><%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %></td>
-	<td>
+	<td class="span1">
 	<%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,8 +16,8 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= experience.department %></td>
+	<td class="span1"><%= experience.department %></td>
-	<td><%= experience.job_title %></td>
+	<td class="span1"><%= experience.job_title %></td>
-	<td><%= User.from_id(experience.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(experience.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_experience.editing_personal_experience') %></h1>
 
 <%= form_for @experience, :url => panel_personal_experience_back_end_experience_path(@experience), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/experience_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/index.html.erb

@@ -1,12 +1,24 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_experiences" class="sort-holder">
@@ -15,6 +27,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_experience_back_end_experience_setting_path, :class => 'btn btn-primary pull-right' %>
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path, :class => 'btn btn-primary pull-right' %>
 	<div id="experience_pagination" class="paginationFixed">
 	<%= paginate @experiences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('experience.new_personal_experience') %></h1>
 <%= form_for @experience, :url => panel_personal_experience_back_end_experiences_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_experience/init.rb

@@ -1,13 +1,9 @@
 module PersonalExperience
   OrbitApp.registration "Experience",:type=> 'ModuleApp' do
     module_label 'module_name.personal_experience'
-
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_experience/plugin/profile",:i18n=>'module_name.personal_experience'
+    personal_plugin :enable => true,:path=>"panel/personal_experience/plugin/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
 
   def index
   
+  get_plugins
+
   get_categorys("HonorCategory",params[:honor_category_ids])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -47,6 +49,8 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
 
   def honor_setting
   
+    get_plugins
+  
     @honor_types = HonorCategory.all
 	
     get_tags
@@ -92,6 +96,8 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   # GET /honors/new.xml
   def new
   
+    get_plugins
+  
     @honor = Honor.new
     @honor_categorys = HonorCategory.all
 	
@@ -105,6 +111,9 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
 
   # GET /honors/1/edit
   def edit
+  
+    get_plugins
+  
     @honor = Honor.find(params[:id])
 	
     @honor_types = HonorCategory.all
@@ -248,6 +257,10 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_honor'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id honor %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (honor.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', honor.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= honor.year %></td>
+	<td class="span1"><%= honor.year %></td>
-	<td>
+	<td class="span1">
 	<%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,7 +16,7 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= honor.awarding_unit %></td>
+	<td class="span1"><%= honor.awarding_unit %></td>
-	<td><%= User.from_id(honor.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(honor.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_honor.editing_personal_honor') %></h1>
 
 <%= form_for @honor, :url => panel_personal_honor_back_end_honor_path(@honor), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/index.html.erb

@@ -1,12 +1,23 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_honors" class="sort-holder">

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('honor.new_personal_honor') %></h1>
 <%= form_for @honor, :url => panel_personal_honor_back_end_honors_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_honor/init.rb

@@ -2,11 +2,8 @@ module PersonalHonor
   OrbitApp.registration "Honor",:type=> 'ModuleApp' do
     module_label 'module_name.personal_honor'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_honor/plugin/profile",:i18n=>'module_name.personal_honor'
+    personal_plugin :enable => true,:path=>"panel/personal_honor/plugin/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
 
   def index
   
+  get_plugins
+  
   get_categorys("JournalPaperType",params[:journal_paper_type_id])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -50,7 +52,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
 
   def writing_journal_setting
   
-    @plugins = ModuleApp.where(has_plugin: true).order_by(:title, :asc)
+    get_plugins
   
     @level_types = JournalLevelType.all
     @author_types = JournalAuthorType.all
@@ -148,6 +150,8 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
   # GET /writing_journals/new.xml
   def new
   
+    get_plugins
+  
     @writing_journal = WritingJournal.new
     # @writing_journal_files = WritingJournalFile.all
     @level_types = JournalLevelType.all
@@ -164,6 +168,9 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
 
   # GET /writing_journals/1/edit
   def edit
+  
+    get_plugins
+  
     @writing_journal = WritingJournal.find(params[:id])
 	
     @level_types = JournalLevelType.all
@@ -355,6 +362,10 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_filter.html.erb

@@ -1,34 +1,6 @@
-<div id='filter' class="subnav">
+<div class="table-label">
-	<ul class="nav nav-pills filter">
+	<div id="sort_headers" class="table-label">
-		<li class="accordion-group">
+		<%= render 'sort_headers' %> 
-			<div class="accordion-heading">
-				<a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("personal_journal.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("personal_journal.categories") %> <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("personal_journal.tags") %> <b class="web-symbol"></b></a>
-			</div>
-		</li>
-	</ul>
-	<div class="filters">
-		<div class="accordion-body collapse" id="collapse-status">
-			<%#= render 'filter_status' %>
-		</div>
-		<div class="accordion-body collapse" id="collapse-category">
-			<%= render 'filter_categories' %>
-		</div>
-		<div class="accordion-body collapse" id="collapse-tags">
-			<%= render 'filter_tags' %>
-		</div>
-		<div id="sort_headers" class="table-label">
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id writing_journal %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (writing_journal.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', writing_journal.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= writing_journal.publication_date %></td>
+	<td class="span1"><%= writing_journal.publication_date %></td>
-	<td>
+	<td class="span1">
 	<%= link_to writing_journal.create_link , panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,6 +16,6 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= User.from_id(writing_journal.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(writing_journal.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_journal.editing_personal_journal') %></h1>
 
 <%= form_for @writing_journal, :url => panel_personal_journal_back_end_writing_journal_path(@writing_journal), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb

@@ -1,12 +1,22 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_writing_journals" class="sort-holder">

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('writing_journal.new_personal_journal') %></h1>
 <%= form_for @writing_journal, :url => panel_personal_journal_back_end_writing_journals_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_journal/init.rb

@@ -2,11 +2,8 @@ module PersonalJournal
   OrbitApp.registration "Journal",:type=> 'ModuleApp' do
     module_label 'module_name.personal_journal'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_journal/plugin/profile",:i18n=>'module_name.personal_journal'
+    personal_plugin :enable => true,:path=>"panel/personal_journal/plugin/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
 
   def index
   
+  get_plugins
+
   # get_categorys("LabCategory",params[:lab_category_ids])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -47,6 +49,8 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
 
   def lab_setting
   
+    get_plugins
+	
     get_tags	
 	
   end
@@ -65,6 +69,8 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
   # GET /labs/new.xml
   def new
   
+    get_plugins
+  
     @lab = Lab.new
 		
     get_tags
@@ -77,6 +83,9 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
 
   # GET /labs/1/edit
   def edit
+  
+    get_plugins
+	
     @lab = Lab.find(params[:id])
 	
     get_tags
@@ -184,6 +193,10 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_lab'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id lab %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (lab.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', lab.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= lab.year %></td>
+	<td class="span1"><%= lab.year %></td>
-	<td>
+	<td class="span1">
 	<%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,7 +16,7 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= lab.location %></td>
+	<td class="span1"><%= lab.location %></td>
-	<td><%= User.from_id(lab.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(lab.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_lab.editing_personal_lab') %></h1>
 
 <%= form_for @lab, :url => panel_personal_lab_back_end_lab_path(@lab), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/index.html.erb

@@ -1,12 +1,23 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_labs" class="sort-holder">

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/lab_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
 

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('lab.new_personal_lab') %></h1>
 <%= form_for @lab, :url => panel_personal_lab_back_end_labs_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_lab/init.rb

@@ -2,11 +2,8 @@ module PersonalLab
   OrbitApp.registration "Lab",:type=> 'ModuleApp' do
     module_label 'module_name.personal_lab'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_lab/plugin/profile",:i18n=>'module_name.personal_lab'
+    personal_plugin :enable => true,:path=>"panel/personal_lab/plugin/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb

@@ -1,209 +0,0 @@
-<% # encoding: utf-8 %>
-
-  <%= f.error_messages %>
-
-	<!--Widget start-->
-	
-	<div id="sub-wiget">
-
-		<div id="widget-tags" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Setting">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
-			<div class="widget-content clear form-horizontal">
-				<% @tags.each do |tag| %>
-					<%= content_tag :label,:class => "checkbox inline" do -%>
-						<%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
-            <%= hidden_field_tag 'writing_patent[tag_ids][]', '' %>
-					<% end %>
-				<% end %>
-			</div>
-		</div>  
-  
-	</div>
-  
-  
-<!--Wiget End-->
-<!--Post Start-->
-
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
-		
-			<div class="title">
-				<%= f.label :year ,t("personal_patent.year")%>
-				<%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]'} ) %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :writing_patent_category ,t("personal_patent.writing_patent_category")%>
-				<%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :period_start_date ,t("personal_patent.period_start_date")%>
-				<%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :period_end_date ,t("personal_patent.period_end_date")%>
-				<%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %>
-			</div>
-			
-			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-				<% end %>
-			</ul>
-			
-			<div class="tab-content">
-			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-				
-				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-					
-					<div class="title">
-						<%= f.label :writing_patent_title ,t("personal_patent.writing_patent_title")%>
-						<%= f.fields_for :writing_patent_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.writing_patent_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :job_title ,t("personal_patent.job_title")%>
-						<%= f.fields_for :job_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.job_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :participator ,t("personal_patent.participator")%>
-						<%= f.fields_for :participator_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.participator_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :unit ,t("personal_patent.unit")%>
-						<%= f.fields_for :unit_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.unit_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-				</div>
-
-				<% end %>
-				
-			</div>
-
-			<div class="title">
-				<%= f.label :url, t("personal_patent.url") %>
-				<%= f.text_field :url %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :keywords, t("personal_patent.keywords") %>
-				<%= f.text_field :keywords %>
-			</div>
-
-			<div class="title">
-				<%= f.label :abstract, t("personal_patent.abstract") %>
-				<%= f.text_field :abstract %>
-			</div>
-	
-			<div id="title">
-				<%= f.label :language, t("personal_patent.language") %>
-				<%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %>
-				<%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> 
-			</div>
-
-			<div class="title">
-				<%= f.label :note, t("personal_patent.note") %>
-				<%= f.text_area :note, :size => "60x3" %>
-			</div>
-			
-		</div>
-		
-		
-		
-		
-			
-		<div>
-					
-			<div id='plugin_files' class="plugin_files_block">
-				
-			<table class="table table-condensed">
-				<thead>
-					<tr>
-						<th>File</th>
-						<th>File Name</th>
-						<th class="span1"></th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<td style="text-align:center" colspan="3">
-							<div id='add_plugin_file' class="info_input plugin_files_block">
-								<%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %>
-								<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
-							</div>
-						</td>
-					</tr>
-				
-				</tfoot>
-				<tbody>
-					
-					<% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %>
-						<%= f.fields_for :writing_patent_files, writing_patent_file do |f| %>
-							<%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %>
-						<% end %>
-					<% end %>	
-				</tbody>
-			</table>
-			
-			</div>
-			
-		</div>
-		
-		
-		
-		
-		
-		
-	</div>
-	
-<!--Post End-->
-
-  
-	<div class="form-actions">
-	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
-	</div> 
-	
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "archive_plugin_form" %>
-	<script>
-		$('#add_plugin_file a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_add_plugin_files", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_file', f, :writing_patent_files) %>").replace(old_id, new_id));
-		});
-		
-		$('.add_plugin_files_block a.delete').live('click', function(){
-		  $(this).parents('.list_item').remove();
-		});
-
-		$('.action a.remove_existing_record').live('click', function(){
-		  $(this).next('.should_destroy').attr('value', 1);
-		  $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-		});
-
-	</script>
-<% end %>

vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

@@ -1,209 +0,0 @@
-<% # encoding: utf-8 %>
-
-  <%= f.error_messages %>
-
-	<!--Widget start-->
-	
-	<div id="sub-wiget">
-
-		<div id="widget-tags" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Setting">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
-			<div class="widget-content clear form-horizontal">
-				<% @tags.each do |tag| %>
-					<%= content_tag :label,:class => "checkbox inline" do -%>
-						<%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
-            <%= hidden_field_tag 'writing_patent[tag_ids][]', '' %>
-					<% end %>
-				<% end %>
-			</div>
-		</div>  
-  
-	</div>
-  
-  
-<!--Wiget End-->
-<!--Post Start-->
-
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
-		
-			<div class="title">
-				<%= f.label :year ,t("personal_patent.year")%>
-				<%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]'} ) %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :writing_patent_category ,t("personal_patent.writing_patent_category")%>
-				<%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :period_start_date ,t("personal_patent.period_start_date")%>
-				<%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :period_end_date ,t("personal_patent.period_end_date")%>
-				<%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %>
-			</div>
-			
-			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-			    <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-				<% end %>
-			</ul>
-			
-			<div class="tab-content">
-			
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-				
-				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-					
-					<div class="title">
-						<%= f.label :writing_patent_title ,t("personal_patent.writing_patent_title")%>
-						<%= f.fields_for :writing_patent_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.writing_patent_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :job_title ,t("personal_patent.job_title")%>
-						<%= f.fields_for :job_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.job_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :participator ,t("personal_patent.participator")%>
-						<%= f.fields_for :participator_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.participator_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :unit ,t("personal_patent.unit")%>
-						<%= f.fields_for :unit_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.unit_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-				</div>
-
-				<% end %>
-				
-			</div>
-
-			<div class="title">
-				<%= f.label :url, t("personal_patent.url") %>
-				<%= f.text_field :url %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :keywords, t("personal_patent.keywords") %>
-				<%= f.text_field :keywords %>
-			</div>
-
-			<div class="title">
-				<%= f.label :abstract, t("personal_patent.abstract") %>
-				<%= f.text_field :abstract %>
-			</div>
-	
-			<div id="title">
-				<%= f.label :language, t("personal_patent.language") %>
-				<%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %>
-				<%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> 
-			</div>
-
-			<div class="title">
-				<%= f.label :note, t("personal_patent.note") %>
-				<%= f.text_area :note, :size => "60x3" %>
-			</div>
-			
-		</div>
-		
-		
-		
-		
-			
-		<div>
-					
-			<div id='plugin_files' class="plugin_files_block">
-				
-			<table class="table table-condensed">
-				<thead>
-					<tr>
-						<th>File</th>
-						<th>File Name</th>
-						<th class="span1"></th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<td style="text-align:center" colspan="3">
-							<div id='add_plugin_file' class="info_input plugin_files_block">
-								<%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %>
-								<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i> ADD/新增</span></a>
-							</div>
-						</td>
-					</tr>
-				
-				</tfoot>
-				<tbody>
-					
-					<% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %>
-						<%= f.fields_for :writing_patent_files, writing_patent_file do |f| %>
-							<%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %>
-						<% end %>
-					<% end %>	
-				</tbody>
-			</table>
-			
-			</div>
-			
-		</div>
-		
-		
-		
-		
-		
-		
-	</div>
-	
-<!--Post End-->
-
-  
-	<div class="form-actions">
-	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
-	</div> 
-	
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "archive_plugin_form" %>
-	<script>
-		$('#add_plugin_file a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_add_plugin_files", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_file', f, :writing_patent_files) %>").replace(old_id, new_id));
-		});
-		
-		$('.add_plugin_files_block a.delete').live('click', function(){
-		  $(this).parents('.list_item').remove();
-		});
-
-		$('.action a.remove_existing_record').live('click', function(){
-		  $(this).next('.should_destroy').attr('value', 1);
-		  $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-		});
-
-	</script>
-<% end %>

vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
 
   def index
   
+  get_plugins
+
   get_categorys("WritingPatentCategory",params[:writing_patent_category_ids])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -47,6 +49,8 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
 
   def writing_patent_setting
   
+    get_plugins
+  
     @patent_types = WritingPatentCategory.all
 	
     get_tags
@@ -92,6 +96,8 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
   # GET /writing_patents/new.xml
   def new
   
+    get_plugins
+  
     @writing_patent = WritingPatent.new
     @writing_patent_categorys = WritingPatentCategory.all
 	
@@ -105,6 +111,9 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
 
   # GET /writing_patents/1/edit
   def edit
+  
+    get_plugins
+	
     @writing_patent = WritingPatent.find(params[:id])
 	
     @patent_types = WritingPatentCategory.all
@@ -245,6 +254,10 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id writing_patent %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (writing_patent.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', writing_patent.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= writing_patent.publish_date.strftime("%Y.%m") %></td>
+	<td class="span1"><%= writing_patent.publish_date.strftime("%Y.%m") %></td>
-	<td>
+	<td class="span1">
 	<%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,10 +16,10 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= writing_patent.patent_no %></td>
+	<td class="span1"><%= writing_patent.patent_no %></td>
-	<td><%= writing_patent.patent_country %></td>
+	<td class="span1"><%= writing_patent.patent_country %></td>
-	<td><%= writing_patent.authors %></td>
+	<td class="span1"><%= writing_patent.authors %></td>
-	<td><%= writing_patent.url %></td>
+	<td class="span1"><%= writing_patent.url %></td>
-	<td><%= User.from_id(writing_patent.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(writing_patent.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_patent.editing_personal_patent') %></h1>
 
 <%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patent_path(@writing_patent), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb

@@ -1,12 +1,26 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_writing_patents" class="sort-holder">

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('writing_patent.new_personal_patent') %></h1>
 <%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patents_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_patent/init.rb

@@ -2,11 +2,8 @@ module PersonalPatent
   OrbitApp.registration "Patent",:type=> 'ModuleApp' do
     module_label 'module_name.personal_patent'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_patent/plugin/profile",:i18n=>'module_name.personal_patent'
+    personal_plugin :enable => true,:path=>"panel/personal_patent/plugin/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb

@@ -12,6 +12,8 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
 
   def index
   
+  get_plugins
+
   get_categorys("ProjectCategory",params[:project_category_id])
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -47,6 +49,8 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
 
   def project_setting
   
+    get_plugins
+  
     @project_types = ProjectCategory.all
 	
     get_tags
@@ -92,6 +96,8 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   # GET /projects/new.xml
   def new
   
+    get_plugins
+  
     @project = Project.new
     @project_categorys = ProjectCategory.all
 	
@@ -105,6 +111,9 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
 
   # GET /projects/1/edit
   def edit
+  
+    get_plugins
+	
     @project = Project.find(params[:id])
 	
     @project_types = ProjectCategory.all
@@ -245,6 +254,10 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id project %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (project.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', project.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
+	<td class="span1"><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
-	<td>
+	<td class="span1">
 	<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,9 +16,9 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= project.participator %></td>
+	<td class="span1"><%= project.participator %></td>
-	<td><%= project.job_title %></td>
+	<td class="span1"><%= project.job_title %></td>
-	<td><%= project.unit %></td>
+	<td class="span1"><%= project.unit %></td>
-	<td><%= User.from_id(project.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(project.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_project.editing_personal_project') %></h1>
 
 <%= form_for @project, :url => panel_personal_project_back_end_project_path(@project), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb

@@ -1,12 +1,25 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_projects" class="sort-holder">

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('project.new_personal_project') %></h1>
 <%= form_for @project, :url => panel_personal_project_back_end_projects_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb

@@ -1,5 +1,14 @@
 <% # encoding: utf-8 %>
 
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <div id="isotope">
             <div class="item element">

vendor/built_in_modules/personal_project/init.rb

@@ -1,12 +1,9 @@
 module PersonalProject
-  OrbitApp.registration "Research Project",:type=> 'ModuleApp' do
+  OrbitApp.registration "Project",:type=> 'ModuleApp' do
     module_label 'module_name.personal_project'
     base_url File.expand_path File.dirname(__FILE__)    
-    personal_plugin :enable => true,:path=>"panel/personal_project/plugin/profile",:i18n=>'module_name.personal_project'
+    personal_plugin :enable => true,:path=>"panel/personal_project/plugin/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb

@@ -8,6 +8,7 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
 
   def index
   
+  get_plugins
   
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -52,6 +53,8 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
   # GET /researchs/new.xml
   def new
   
+    get_plugins
+  
     @research = Research.new
 	
     get_tags
@@ -64,6 +67,9 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
 
   # GET /researchs/1/edit
   def edit
+  
+    get_plugins
+	
     @research = Research.find(params[:id])
 	
     get_tags
@@ -172,6 +178,10 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
   #   end
   # end
   
+  def get_plugins  
+    @plugins = OrbitApp::Module::Registration.all
+  end
+  
   def get_tags
   	module_app = ModuleApp.first(:conditions => {:key => 'personal_research'})
   	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_filter.html.erb

@@ -1,8 +1,6 @@
-<div id="filter" class="subnav">
+<div class="table-label">
-	<div class="filters">
+	<div id="sort_headers" class="table-label">
-		<div id="sort_headers" class="table-label">
+		<%= render 'sort_headers' %> 
-			<%= render 'sort_headers' %> 
-		</div>
 	</div>
 </div>
 

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb

@@ -1,11 +1,11 @@
 <tr id="<%= dom_id research %>" class="with_action">
-	<td>
+	<td class="span1">
 		<% if (research.create_user_id ==  current_user.id) || is_manager? %>
 			<%= check_box_tag 'to_delete[]', research.id, false, :class => "checkbox_in_list" %>
 		<% end -%>
 	</td>
-	<td><%= research.publish_date.strftime("%Y.%m") %></td>
+	<td class="span1"><%= research.publish_date.strftime("%Y.%m") %></td>
-	<td>
+	<td class="span1">
 	<%= link_to research.research_title , panel_personal_research_front_end_research_path(research) %>
 	<div class="quick-edit">
 		<ul class="nav nav-pills hide">
@@ -16,7 +16,7 @@
 		</ul>
 	</div>
 	</td>
-	<td><%= research.url %></td>
+	<td class="span1"><%= research.url %></td>
-	<td><%= User.from_id(research.create_user_id).name rescue ''%></td>
+	<td class="span1"><%= User.from_id(research.create_user_id).name rescue ''%></td>
 </tr>
 

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/edit.html.erb

@@ -1,3 +1,13 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
+
 <h1><%= t('personal_research.editing_personal_research') %></h1>
 
 <%= form_for @research, :url => panel_personal_research_back_end_research_path(@research), :html => {:class => 'clear'} do |f| %>

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb

@@ -1,12 +1,23 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
 <%= render 'filter' %>
+
+</div>
+
 <table class="table main-list">
 	<thead>
 		<tr>
 			<th class="span1"></th>
 			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
-			<th class="span3"></th>
+			<th class="span1"></th>
-			<th class="span2"></th>
+			<th class="span1"></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_researchs" class="sort-holder">

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/new.html.erb

@@ -1,10 +1,21 @@
+<% 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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<div class="subnav">
+
+<%= render :partial => 'admin/plugins/plugin_list' %>
+
+</div>
 
 <%= flash_messages %>
+
 <div id="poststuff">
 <h1><%= t('research.new_personal_research') %></h1>
 <%= form_for @research, :url => panel_personal_research_back_end_researchs_path, :html => {:class => 'clear'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
+
 <%#= link_back %>
 

vendor/built_in_modules/personal_research/init.rb

@@ -2,11 +2,8 @@ module PersonalResearch
   OrbitApp.registration "Research",:type=> 'ModuleApp' do
     module_label 'module_name.personal_research'
     base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true,:path=>"panel/personal_research/plugin/profile",:i18n=>'module_name.personal_research'
+    personal_plugin :enable => true,:path=>"panel/personal_research/plugin/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research'
-    
-
   end
-
 end
 
 

vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb

@@ -1,31 +0,0 @@
-class Panel::PersonalSeminar::FrontEnd::WritingSeminarsController < OrbitWidgetController
-
-  def initialize
-    super
-    @app_title = 'personal_seminar'
-  end
-  
-
-  def index
-	
-	@writing_seminars = WritingSeminar.desc(:year).page(params[:page]).per(10)
-	
-  end
-
-  # GET /writing_seminars/1
-  # GET /writing_seminars/1.xml
-  def show
-    @writing_seminar = WritingSeminar.find(params[:id])
-	
-	@seminar_paper_types = ( !@writing_seminar.seminar_paper_types.blank? ? @writing_seminar.seminar_paper_types.collect{|x| x.title}.join(', ') : nil)
-	@seminar_author_types = ( !@writing_seminar.seminar_author_types.blank? ? @writing_seminar.seminar_author_types.collect{|x| x.title}.join(', ') : nil)
-  
-  end
-  
-  
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_seminar'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
-end

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb

@@ -1,26 +0,0 @@
-<% # encoding: utf-8 %>
-
-<%= flash_messages %>
-
-<h1><%= t('writing_seminar.list_writing_seminar') %></h1>
-
-
-	<table>
-	  <tr>
-		<th><%= t(:year) %></th>
-		<th><%= t(:title) %></th>
-	  </tr>
-
-	<% @writing_seminars.each do |post| %>
-	  <tr>
-		<td><%= post.year %></td>
-		<td>
-		<%= link_to post.create_link , panel_personal_seminar_front_end_writing_seminar_path(post) %>
-		</td>
-	  </tr>
-	  
-	<% end %>
-	
-	</table>
-
-<%= paginate @writing_seminars, :params => {:inner => false}%>

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb

@@ -1,36 +0,0 @@
-<% # encoding: utf-8 %>
-
-<table>
-<caption> <%= t("writing_seminar") %> </caption>
-<tbody>
-<tr><th><%= t("writing_seminar.year")%></th><td><%= @writing_seminar.year %></td></tr>
-<tr><th><%= t("writing_seminar.language")%></th><td><%= @writing_seminar.language %></td></tr>
-<tr><th><%= t("writing_seminar.paper_title")%></th><td><%= @writing_seminar.paper_title %></td></tr>
-<tr><th><%= t("writing_seminar.seminar_title")%></th><td><%= @writing_seminar.seminar_title %></td></tr>
-<tr><th><%= t("writing_seminar.seminar_paper_types")%></th><td><%= @seminar_paper_types %></td></tr>
-<tr><th><%= t("writing_seminar.seminar_author_types")%></th><td><%= @seminar_author_types %></td></tr>
-<tr><th><%= t("writing_seminar.location")%></th><td><%= @writing_seminar.location %></td></tr>
-<tr><th><%= t("writing_seminar.sponsor")%></th><td><%= @writing_seminar.sponsor %></td></tr>
-<tr><th><%= t("writing_seminar.period_start_date")%></th><td><%= @writing_seminar.period_start_date %></td></tr>
-<tr><th><%= t("writing_seminar.period_end_date")%></th><td><%= @writing_seminar.period_end_date %></td></tr>
-<tr><th><%= t("writing_seminar.abstract")%></th><td><%= @writing_seminar.abstract %></td></tr>
-<tr><th><%= t("writing_seminar.publication_date")%></th><td><%= @writing_seminar.publication_date %></td></tr>
-<tr><th><%= t("writing_seminar.url")%></th><td><%= link_to t(:url), @writing_seminar.url, {:target => '_blank', :title => @writing_seminar.seminar_title} if !@writing_seminar.url.blank? %></td></tr>
-<tr><th><%= t("writing_seminar.note")%></th><td><%= @writing_seminar.note %></td></tr>
-<tr><th><%= t("writing_seminar.authors")%></th><td><%= "#{User.from_id(@writing_seminar.create_user_id).name rescue ''},#{@writing_seminar.authors rescue ''}"%></td></tr>
-<tr><th><%= t("writing_seminar.files")%></th>
-<td>
-<% if @writing_seminar.writing_seminar_files.size > 0 %>
-		<div>
-			<i class="icons-paperclip"></i>
-			<div class="showFile">
-					<% @writing_seminar.writing_seminar_files.each do | wsfile | %>
-					<%= link_to wsfile.title, wsfile.file.url, {:target => '_blank', :title => wsfile.title} if wsfile.file.file %>
-					<% end %>
-			</div>
-		</div>
-	<% end %>
-</td>
-</tr>
-</tbody>
-</table>