Add Brief intro. for all personal plugins

Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix

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

@@ -0,0 +1,10 @@
+class Panel::PersonalProject::BackEnd::PersonalProjectIntrosController < Admin::PersonalPluginIntrosController
+
+  def initialize
+    super
+    @app_type = 'personal_project_intro'
+    @app_type_name = 'personal_project'
+    @reback_name = 'Project'
+  end
+  
+end

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

@@ -10,40 +10,19 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   end
 
   def index
-  
-  get_plugins
+    get_plugins
 
-  get_categorys("ProjectCategory",params[:project_category_id])
-  @filter = params[:filter]
-  new_filter = params[:new_filter]
-
-  if @filter && params[:clear]
-    @filter.delete(params[:type])
-  elsif @filter && new_filter
-    if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
-      @filter[new_filter[:type]].delete(new_filter[:id].to_s)
-    elsif @filter.has_key?(new_filter[:type])
-      @filter[new_filter[:type]] << new_filter[:id].to_s
-    else
-      @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
-    end
-  elsif new_filter
-    @filter = {new_filter[:type] => [new_filter[:id].to_s]}
-  end
-  
-  @project_categorys =  get_categories_for_index("ProjectCategory")
-  @project_category_ids = @project_categorys.collect{|t| t.id.to_s} + [nil]
-
-  
-  @projects = (params[:sort] || @filter) ? get_sorted_and_filtered("project",:project_category_id.in => @project_category_ids) : get_viewable("project",:project_category_id.in => @project_category_ids)
-  @project_pages = @projects.page params[:page]
-  
-  @tags = get_tags
+    # @tags = get_tags
+    # @categories = get_categories_for_index
+    # @statuses = get_statuses
+    # category_ids = @categories.collect{|t| t.id}
+    @project_category_ids = ProjectCategory.all.collect{|t| t.id.to_s} + [nil]
 
+    @projects = get_sorted_and_filtered("project", :project_category_id.in => @project_category_ids)
     respond_to do |format|
       format.html # index.html.erb
+      format.js { }
       format.xml  { render :xml => @projects }
-      format.js
     end
   end
 
@@ -51,12 +30,12 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   
     get_plugins
   
-    @project_types = ProjectCategory.all
+    @project_categorys = ProjectCategory.all
 	
     @tags = get_tags
 	
     @set_project_type = ProjectCategory.new(:display => 'List')
-	@project_type_url = panel_personal_project_back_end_projects_path
+  	@project_type_url = panel_personal_project_back_end_projects_path
 	
 	
   end
@@ -125,47 +104,47 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
   # POST /projects.xml
   def create
   
-  if params[:project_category]
-		
-		@project_category = ProjectCategory.new(params[:project_category])
+    if params[:project_category]
+  		
+  		@project_category = ProjectCategory.new(params[:project_category])
 
-		respond_to do |format|
-		  if @project_category.save
-			format.js { render 'create_project_setting' }
-		  end
-		end
-	
-  else
-	
-    @project_types = ProjectCategory.all
-	@tags = get_tags
-  
-    @project = Project.new(params[:project])
-	
-	if params[:project][:user_id]
-      @project.create_user_id = params[:project][:user_id]
-      @project.update_user_id = params[:project][:user_id]
+  		respond_to do |format|
+  		  if @project_category.save
+  			format.js { render 'create_project_setting' }
+  		  end
+  		end
+  	
     else
-	  @project.create_user_id = current_user.id
-      @project.update_user_id = current_user.id
-    end
-
-    respond_to do |format|
-      if @project.save
-	  
- 		if params[:project][:user_id]
-          format.html { redirect_to(admin_users_new_interface_url(:id=>params[:project][:user_id],:show_plugin_profile=>'Research Project')) }
-        else
-		  format.html { redirect_to(panel_personal_project_back_end_projects_url) }
-        end
-
-        format.xml  { render :xml => @project, :status => :created, :location => @project }
+  	
+      @project_types = ProjectCategory.all
+  	  @tags = get_tags
+    
+      @project = Project.new(params[:project])
+  	
+  	  if params[:project][:user_id]
+        @project.create_user_id = params[:project][:user_id]
+        @project.update_user_id = params[:project][:user_id]
       else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
+  	    @project.create_user_id = current_user.id
+        @project.update_user_id = current_user.id
+      end
+
+      respond_to do |format|
+        if @project.save
+  	  
+   		    if params[:project][:user_id]
+            format.html { redirect_to(admin_users_new_interface_url(:id=>params[:project][:user_id],:show_plugin_profile=>"Project")) }
+          else
+  		      format.html { redirect_to(panel_personal_project_back_end_projects_url) }
+          end
+
+          format.xml  { render :xml => @project, :status => :created, :location => @project }
+        else
+          format.html { render :action => "new" }
+          format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
+        end
       end
     end
-  end
   
   end
 
@@ -191,7 +170,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
 	
     @project.update_user_id = current_user.id
 	
-	params[:project][:tag_ids] ||=[]
+  	params[:project][:tag_ids] ||=[]
 
     respond_to do |format|
       if @project.update_attributes(params[:project])
@@ -226,6 +205,29 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
     end
     redirect_to panel_personal_project_back_end_projects_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
+
+  def data_share
+
+    if params[:ids]
+    
+      @projects = Project.any_in(:_id => params[:ids])
+      
+      @projects.each do |project|
+
+        project.is_hidden = params[:disable]
+
+        project.save
+      end
+
+    end
+
+    respond_to do |format|
+    
+      format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Project")) }
+      
+    end
+
+  end
   
   protected
  

vendor/built_in_modules/personal_project/app/models/personal_project_intro.rb

@@ -0,0 +1,4 @@
+class PersonalProjectIntro < PersonalPluginIntro
+
+  
+end

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

@@ -1,219 +1,296 @@
 <% # encoding: utf-8 %>
+<% content_for :page_specific_css do %>
+  <%= stylesheet_link_tag "lib/main-forms" %>
+  <%= stylesheet_link_tag "lib/fileupload" %>
+  <%= stylesheet_link_tag "lib/main-list" %>
+<% end %>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "lib/bootstrap-fileupload" %> 
+  <%= javascript_include_tag "lib/file-type" %>
+  <%= javascript_include_tag "lib/module-area" %>
+<% end %>
 
   <%= f.error_messages %>
 
-	<!--Widget start-->
-	
-	<div id="sub-wiget">
+<!-- Input Area -->
+<div class="input-area">
 
-		<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 'project[tag_ids][]', tag.id, @project.tag_ids.include?(tag.id)%>
-						<%= tag.name %>
-            <%= hidden_field_tag 'project[tag_ids][]', '' %>
-					<% end %>
-				<% end %>
-			</div>
-		</div>  
-  
-	</div>
-  
-  
-<!--Wiget End-->
-<!--Post Start-->
+  <!-- Module Tabs --> 
+  <div class="nav-name"><strong><%= t(:module) %></strong></div>
+  <ul class="nav nav-pills module-nav">
+    <li></li>
+    <li class="active">
+      <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
+    </li>
+    <% if show_form_status_field(@project) %>
+      <li>
+        <a href="#status" data-toggle="tab"><%= t(:status) %></a>
+      </li>
+    <% end %>
+    <li>
+      <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
+    </li>
+  </ul>
 
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
-			
-			<% if !params[:user_id].blank? %>
-			
-			<div class="span6">
-				<%= t("著作人")%>
-				<%= User.from_id(params[:user_id]).name rescue ''%>
-			</div>
-			
-			<% end %>		
-		
-			<div class="title">
-				<%= f.label :year ,t("personal_project.year")%>
-				<%= select_year((@project.year ? @project.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'project[year]'} ) %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :project_category ,t("personal_project.project_category")%>
-				<%= f.select :project_category_id, @project_categorys.collect {|t| [ t.title, t.id ]} %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :period_start_date ,t("personal_project.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_project.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 :project_title ,t("personal_project.project_title")%>
-						<%= f.fields_for :project_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@project.project_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :job_title ,t("personal_project.job_title")%>
-						<%= f.fields_for :job_title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@project.job_title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :participator ,t("personal_project.participator")%>
-						<%= f.fields_for :participator_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@project.participator_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-					<div class="title">
-						<%= f.label :unit ,t("personal_project.unit")%>
-						<%= f.fields_for :unit_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@project.unit_translations[locale] rescue nil) %>
-						<% end %>
-					</div>
-					
-				</div>
+  <!-- Module -->
+  <div class="tab-content module-area">
 
-				<% end %>
-				
-			</div>
+    <!-- Basic Module -->
+    <div class="tab-pane fade in active" id="basic">
 
-			<div class="title">
-				<%= f.label :url, t("personal_project.url") %>
-				<%= f.text_field :url %>
-			</div>
-			
-			<div class="title">
-				<%= f.label :keywords, t("personal_project.keywords") %>
-				<%= f.text_field :keywords %>
-			</div>
+      <% if !params[:user_id].blank? %>
+      
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_plugins.author") %></label>
+        <div class="controls">
+          <%= User.from_id(params[:user_id]).name rescue ''%>
+        </div>
+      </div> 
 
-			<div class="title">
-				<%= f.label :abstract, t("personal_project.abstract") %>
-				<%= f.text_field :abstract %>
-			</div>
-	
-			<div id="title">
-				<%= f.label :language, t("personal_project.language") %>
-				<%= f.radio_button :language, "Chinese" %> <%= t("personal_project.Chinese") %>
-				<%= f.radio_button :language, "English" %> <%= t("personal_project.English") %> 
-			</div>
+      <% end %>
 
-			<div class="title">
-				<%= f.label :note, t("personal_project.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', @project.project_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>
-					
-					<% @project.project_files.each_with_index do |project_file, i| %>
-						<%= f.fields_for :project_files, project_file do |f| %>
-							<%= render :partial => 'form_file', :object => project_file, :locals => {:f => f, :i => i} %>
-						<% end %>
-					<% end %>	
-				</tbody>
-			</table>
-			
-			</div>
-			
-		</div>
-		
-		
-		
-		
-		
-		
-	</div>
-	
-<!--Post End-->
+      <!-- year -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.year") %></label>
+        <div class="controls">
+			<%= select_year((@project.year ? @project.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'project[year]',:class => 'span1'} ) %>
+        </div>
+      </div> 
 
-  
-	<div class="form-actions">
-	<%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %>
-	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
-	</div> 
-	
+      <!-- project_category -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.project_category") %></label>
+        <div class="controls">
+			<%= f.select :project_category_id, @project_categorys.collect {|t| [ t.title, t.id ]} %>
+        </div>
+      </div>
+
+      <!-- period_start_date -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.start_date") %></label>
+        <div class="controls">
+			<%= 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> 
+
+      <!-- period_end_date -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.end_date") %></label>
+        <div class="controls">
+			<%= 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>
+      </div> 
+
+      <!-- url -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.url") %></label>
+        <div class="controls">
+			<%= f.text_field :url , :class => "span6" %>
+        </div>
+      </div> 
+
+      <!-- keywords -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.keywords") %></label>
+        <div class="controls">
+			<%= f.text_field :keywords %>
+        </div>
+      </div> 
+
+      <!-- language -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.language") %></label>
+        <div class="controls">
+			<%= f.radio_button :language, "Chinese" %> <%= t("personal_project.Chinese") %>
+			<%= f.radio_button :language, "English" %> <%= t("personal_project.English") %> 
+        </div>
+      </div> 
+
+      <!-- abstract -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.abstract") %></label>
+        <div class="controls">
+			<%= f.text_field :abstract %>
+        </div>
+      </div> 
+
+      <!-- note -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t("personal_project.note") %></label>
+        <div class="controls">
+          <%= f.text_area :note, rows: 2, class: "input-block-level" %>
+        </div>
+      </div> 
+
+    </div>
+
+    <!-- Status Module -->
+    <% if show_form_status_field(@project) %>
+      <div class="tab-pane fade" id="status">
+
+        <!-- Status -->
+        <div class="control-group">
+          <label class="control-label muted"><%= t(:status) %></label>
+          <div class="controls" data-toggle="buttons-checkbox">
+            <label class="checkbox inline btn <%= 'active' if @project.is_hidden? %>">
+              <%= f.check_box :is_hidden %> <%= t(:hide) %>
+            </label>
+          </div>
+        </div>
+
+      </div>
+    <% end %>
+
+    <!-- Tag Module -->
+    <div class="tab-pane fade" id="tag">
+
+      <!-- Tag -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:tags) %></label>
+        <div class="controls" data-toggle="buttons-checkbox">
+          <% @tags.each do |tag| %>
+            <label class="checkbox inline btn <%= 'active' if @project.tag_ids.include?(tag.id) %>">
+              <%= check_box_tag 'project[tag_ids][]', tag.id, @project.tag_ids.include?(tag.id) %> <%= tag.name %>
+              <%= hidden_field_tag 'project[tag_ids][]', '' %>
+            </label>
+          <% end %>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+
+  <!-- Language Tabs -->
+  <div class="nav-name"><strong><%= t(:language) %></strong></div>
+  <ul class="nav nav-pills language-nav">
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+      <li class="<%= 'active' if i == 0 %>">
+        <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
+      </li>
+    <% end %>
+  </ul>
+
+  <!-- Language -->
+  <div class="tab-content language-area">
+
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+    
+      <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
+
+        <!-- project_title-->
+        <div class="control-group input-title">
+          <label class="control-label muted"><%= t("personal_project.project_title") %></label>
+          <div class="controls">          	
+            <%= f.fields_for :project_title_translations do |f| %>
+              <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.project_title"), value: (@project.project_title_translations[locale] rescue nil) %>
+            <% end %>
+          </div>
+        </div>
+
+        <!-- job_title-->
+        <div class="control-group input-title">
+          <label class="control-label muted"><%= t("personal_project.job_title") %></label>
+          <div class="controls">          	
+            <%= f.fields_for :job_title_translations do |f| %>
+              <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.job_title"), value: (@project.job_title_translations[locale] rescue nil) %>
+            <% end %>
+          </div>
+        </div>
+
+        <!-- participator-->
+        <div class="control-group input-title">
+          <label class="control-label muted"><%= t("personal_project.participator") %></label>
+          <div class="controls">          	
+            <%= f.fields_for :participator_translations do |f| %>
+              <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.participator"), value: (@project.participator_translations[locale] rescue nil) %>
+            <% end %>
+          </div>
+        </div>
+
+        <!-- unit-->
+        <div class="control-group input-title">
+          <label class="control-label muted"><%= t("personal_project.unit") %></label>
+          <div class="controls">          	
+            <%= f.fields_for :unit_translations do |f| %>
+              <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.unit"), value: (@project.unit_translations[locale] rescue nil) %>
+            <% end %>
+          </div>
+        </div>
+
+      </div>
+
+    <% end %>
+
+    <!-- File -->
+    <div class="control-group">
+      <label class="control-label muted"><%= t(:file_) %></label>
+      <div class="controls">
+
+        <!-- Exist -->
+        <% if @project && !@project.project_files.blank? %>
+          <div class="exist">
+            <% @project.project_files.each_with_index do |project_file, i| %>
+              <%= f.fields_for :project_files, project_file do |f| %>
+                <%= render :partial => 'form_file', :object => project_file, :locals => {:f => f, :i => i} %>
+              <% end %>
+            <% end %> 
+            <hr>
+          </div>
+        <% end %>
+
+        <!-- Add -->
+        <div class="add-target">
+        </div>
+        <p class="add-btn">
+          <%= hidden_field_tag 'plugin_file_field_count', @project.project_files.count %>
+          <a id="add_file" class="trigger btn btn-small btn-primary"><i class="icons-plus"></i> <%= t(:add) %></a>
+        </p>
+
+      </div>
+    </div>
+
+
+
+
+   </div>
+
+
+
+</div>
+
+<!-- Form Actions -->
+<div class="form-actions">
+  <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %>
+  <%= 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, :project_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>
+  <script>
+    $(document).ready(function() {
+    	$('.main-forms .add-on').tooltip();
+      $(document).on('click', '#add_file', function(){
+        var new_id = $(this).prev().attr('value');
+        var old_id = new RegExp("new_project_files", "g");
+        var on = $('.language-nav li.active').index();
+        var le = $(this).parent('.add-btn').prev('.add-target').children('.start-line').length;
+        $(this).prev().attr('value', parseInt(new_id) + 1);
+        $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_file', f, :project_files) %>").replace(old_id, new_id));
+        $(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
+          $(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
+        });
+        formTip();
+      }); 
+      $(document).on('click', '.delete_file', function(){
+        $(this).parents('.input-prepend').remove();
+      });
+      $(document).on('click', '.remove_existing_record', function(){
+        if(confirm("<%= I18n.t(:sure?)%>")){
+          $(this).children('.should_destroy').attr('value', 1);
+          $(this).parents('.start-line').hide();
+        }
+      });
+    });
+  </script>
 <% end %>

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

@@ -1,50 +1,45 @@
-<% # encoding: utf-8 %>
-
-		<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class='list_item'>
-			<td>
-				<div class="control-group">
-					<div class="controls">
-					<%= f.file_field :file %>
-					<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %>
-					</div>
-				</div>
-			</td>	
-			<td>	
-			
-				<div class="tab-content">
-				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
-					
-					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-						<%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %>
-						<%= f.fields_for :file_title_translations do |f| %>
-							<div class="control-group">
-							<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.from_locale(locale) %></label>
-							<div class="controls">
-							<%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %>
-							</div>
-							</div>
-						<% end %>	
-						
-					</div>
-
-					<% end %>
-					
-				</div>
-				
-			</td>
-			
-			<td>
-			<span class="action">
-			<% if form_file.new_record? %>
-			  <a class="delete"><i class="icon-remove"></i></a>
-			<% else %>	
-			  <%= f.hidden_field :id %>
-			  <a class="remove_existing_record"><i class="icon-remove"></i></a>
-			  <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
-			<% end %>
-			</span>
-			
-			</td>
-		</tr>
-		
+<% if form_file.new_record? %>
+  <div class="fileupload fileupload-new start-line" data-provides="fileupload">
+<% else %>
+  <div class="fileupload fileupload-exist start-line" data-provides="fileupload">
+    <% if form_file.file.blank? %>
+      <%= t(:no_file) %>
+    <% else %>
+      <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %>
+    <% end %>
+<% end %>
+  <div class="input-prepend input-append">
+    <label>
+      <span class="add-on btn btn-file" title='<%= t(:file_) %>'>
+        <i class="icons-paperclip"></i>
+        <%= f.file_field :file %>
+      </span>
+      <div class="uneditable-input input-medium">
+        <i class="icon-file fileupload-exists"></i>
+        <span class="fileupload-preview"><%= (form_file.new_record? || form_file.file.blank?) ? t(:select_file) : t(:change_file) %></span>
+      </div>
+    </label>
+    <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
+    <span class="tab-content">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+        <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
+          <%= f.fields_for :title_translations do |f| %>
+            <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
+          <% end %>
+        </span>
+      <% end %>
+    </span>
+    </span>
+    <% if form_file.new_record? %>
+      <span class="delete_file add-on btn" title="<%= t(:delete_) %>">
+        <a class="icon-trash"></a>
+      </span>
+    <% else %> 
+      <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
+        <%= f.hidden_field :id %>
+        <a class="icon-remove"></a>
+        <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
+      </span>
+    <% end %>
+  </div>
+</div>

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

@@ -1,9 +1,4 @@
 <tr id="<%= dom_id project %>" class="with_action">
-	<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 class="span1"><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
 	<td class="span1">
 	<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>

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

@@ -8,8 +8,8 @@
 
 </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| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
+<%= form_for @project, url: panel_personal_project_back_end_project_path(@project), html: {class: "form-horizontal main-forms previewable"} do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: {f: f} %>
+  </fieldset>
+<% end %>

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

@@ -13,13 +13,12 @@
 <table class="table main-list">
 	<thead>
 		<tr>
-			<th class="span1"></th>
-			<th class="span1"></th>
-			<th class="span1"></th>
-			<th class="span1"></th>
-			<th class="span1"></th>
-			<th class="span1"></th>
-			<th class="span1"></th>
+			<th class="span2"><%= t('personal_project.period') %></th>
+			<th class="span2"><%= t('personal_project.project_title') %></th>
+			<th class="span1"><%= t('personal_project.participator') %></th>
+			<th class="span1"><%= t('personal_project.job_title') %></th>
+			<th class="span1"><%= t('personal_project.unit') %></th>
+			<th class="span1"><%= t("personal_plugins.author") %></th>
 		</tr>
 	</thead>
 	<tbody id="tbody_projects" class="sort-holder">
@@ -28,8 +27,9 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_project_back_end_project_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_project_back_end_project_path, :class => 'btn btn-primary pull-right' %>
-	<div id="project_pagination" class="paginationFixed">
-	<%= paginate @project_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
+	<div id="lab_pagination" class="paginationFixed">
+	<%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
 	</div>
 </div>

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

@@ -8,14 +8,8 @@
 
 </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 %>
-
+<%= form_for @project, url: panel_personal_project_back_end_projects_path, html: {class: "form-horizontal main-forms previewable"} do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: {f: f} %>
+  </fieldset>
+<% end %>

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

@@ -15,7 +15,7 @@
                 <div class="detail w-a h-a">
                     <p class="totle">
 						<a class="btn btn-small btn-primary pull-right" href="<%= panel_personal_project_back_end_project_project_category_quick_add_path('add') %>#myModal1" data-toggle="modal" data-remote="true"><i class="icon-plus"></i> <%= t('add')%></a>
-                        <span>專利類別</span>                        
+                        <span><%= t("personal_project.project_category") %></span>                        
                     </p>
                     <div class="detal-list my_scroll">
                         <div class="scrollbar">

vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/_profile.html.erb

@@ -1,38 +1,48 @@
 <%
   if @member
-    @projects = Project.where(:create_user_id => @member.id).desc(:period_start_date)
-  else
-    @projects = Project.all.page(params[:page]).per(10)
-  end
+
+    @projects = Project.where(is_hidden: false, :create_user_id => @member.id).desc(:period_start_date)
+
+    @project_intro = !PersonalProjectIntro.where(:user_id => @member.id).blank? ? PersonalProjectIntro.where(:user_id => @member.id).first : PersonalProjectIntro.new
 %>
-  
-<% if !@projects.blank? %>  
 
-<table class="table">
-  <thead>
-    <tr>
-			<th class="grid3"><%= t('personal_project.period') %></th>
-			<th class="grid9"><%= t('personal_project.project_title') %></th>
-		</tr>
-  </thead>
-  <tbody>
-		
-	<% @projects.each do |project| %>	
-			
-    <tr>
-			<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
-			<td>
-			<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
-			</td>
-		</tr>		
-		
-	<% end %>	
+  <% if @project_intro.brief_intro and !@project_intro.blank? %> 
 
-  </tbody>
-</table>
+    <div class="info">
+        <%= @project_intro.text.html_safe rescue '' %>
+      </div>
 
-<% else %> 
+  <% end %> 
 
-  <%= t('nothing')%>
+  <% if ( !@project_intro.blank? and @project_intro.complete_list ) or @project_intro.blank? %> 
+
+    <% if !@projects.blank? %> 
+
+      <table class="table">
+        <thead>
+          <tr>
+      			<th class="grid3"><%= t('personal_project.period') %></th>
+      			<th class="grid9"><%= t('personal_project.project_title') %></th>
+      		</tr>
+        </thead>
+        <tbody>
+      		
+      	<% @projects.each do |project| %>	
+      			
+          <tr>
+      			<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
+      			<td>
+      			<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
+      			</td>
+      		</tr>		
+      		
+      	<% end %>	
+
+        </tbody>
+      </table>
+
+    <% end %> 
+
+  <% end %> 
 
 <% end %> 

vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/_profile.html.erb

@@ -1,3 +1,10 @@
+<% content_for :page_specific_css do %>
+  <%= stylesheet_link_tag "lib/list-check" %>
+<% end %>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "lib/list-check" %>
+<% end %>
+
 <%
   @filter = params[:filter]
   new_filter = params[:new_filter]
@@ -17,18 +24,29 @@
   end
 
 
-  if @user
-    @projects = Project.where(:create_user_id => @user.id).page(params[:page]).per(10)
+  if @user && is_admin?
+    @projects = Project.where(:create_user_id => @user.id).desc(:period_start_date).page(params[:page]).per(10)
   else
-    @projects = Project.all.page(params[:page]).per(10)
+    @projects = Project.where(is_hidden: false, :create_user_id => @user.id).desc(:period_start_date).page(params[:page]).per(10)
   end
 
-
 %>
 
+<% if is_admin? %>
+<div class="list-active">
+  <div class="btn-group">
+    <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_project_back_end_projects_path(:user_id => params[:id], :disable => 'true') ) %>
+    <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_project_back_end_projects_path(:user_id => params[:id], :disable => 'false') ) %>
+  </div>
+</div>
+<% end -%>
+
 <table class="table table-condensed table-striped">
   <thead>
     <tr>
+      <% if is_admin? %>
+      <th><input type="checkbox" class="list-check" /></th>
+      <% end -%>
 			<th class="span2"><%= t('personal_project.period') %></th>
 			<th><%= t('personal_project.project_title') %></th>
 		</tr>
@@ -37,7 +55,12 @@
 		
 	<% @projects.each do |project| %>	
 			
-    <tr>
+    <tr class="<%= project.is_hidden ? "checkHide" : "" %>">
+      <% if is_admin? %>
+      <td>
+        <%= check_box_tag 'to_change[]', project.id.to_s, false, :class => "list-check" %>
+      </td>
+      <% end -%>
 			<td><%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %></td>
 			<td>
 			<%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %>
@@ -49,11 +72,25 @@
   </tbody>
 </table>
 
+<% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
+    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_project_back_end_personal_project_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
 	</div>
 </div>
+<% end %>
+
+<div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3><%= t(:sure?) %></h3>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
+    <button class="delete-item btn btn-danger"><%= t(:submit) %></button>
+  </div>
+</div>

vendor/built_in_modules/personal_project/config/routes.rb

@@ -13,12 +13,15 @@ Rails.application.routes.draw do
         resources :projects do
           collection do
             get 'delete'
+            get 'data_share'
           end
 		  
           match "project_category_quick_add" => "projects#project_category_quick_add" ,:as => :project_category_quick_add
           match "project_category_quick_edit" => "projects#project_category_quick_edit" ,:as => :project_category_quick_edit
         end
-		resources :project_categorys
+        
+        resources :personal_project_intros
+        resources :project_categorys
         resources :tags
       end
       namespace :front_end do

vendor/built_in_modules/personal_project/init.rb

@@ -2,7 +2,7 @@ module PersonalProject
   OrbitApp.registration "PersonalProject",: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",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project'
+    personal_plugin :enable => true, :app_name=>"Project", :intro_app_name=>"PersonalProjectIntro",:path=>"panel/personal_project/plugin/profile",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project'