isotope fixed for all plugins for list and form.

Fixed issue with member plugin delete label
Updated Bulletins controller with announcement approval fix
2013-10-01 14:29:39 +08:00 · 2013-10-01 10:43:37 +08:00 · 2013-10-01 10:03:18 +08:00 · 2013-09-30 18:25:18 +08:00 · 2013-09-30 17:25:02 +08:00 · 2013-09-30 16:59:50 +08:00
69 changed files with 347 additions and 348 deletions
@@ -226,7 +226,8 @@ var orbitDesktop = function(dom){

  this.bindDesktopEvents = function(){  //this function will bind the global handlers to thd desktop, for example doc
    $(".docklist a").click(function(){
-        o.menu_item($(this));
+      if( !$( this ).parent().hasClass( 'disable' ) )
+          o.menu_item($(this));
      return false;
    });

@@ -274,10 +275,11 @@ var orbitDesktop = function(dom){
    });

    $("body").on("click","*[ajax-remote]",function(){
-      var $e = $(this);
-      var t = $e.attr("ajax-remote");
-      var classes_to_toggle = $e.attr("toggle-onclick");
-      var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
+      var $e = $(this),
+          t = $e.attr("ajax-remote"),
+          classes_to_toggle = $e.attr("toggle-onclick"),
+          responsetype = $e.attr('response-type') ? $e.attr('response-type') : "html",
+          exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
      if(classes_to_toggle){
        $e.toggleClass(classes_to_toggle);
      }
@@ -289,9 +291,9 @@ var orbitDesktop = function(dom){
      }
      var ca = $e.attr("content-holder");
      var a = function(){
-
        $.ajax({
            type : t,
+            dataType : responsetype,
            url : $e.attr("href"),
            success : function(data){
              if(typeof data == "string"){
@@ -302,6 +304,7 @@ var orbitDesktop = function(dom){
                  // $("div[container=true]").html(data);
                }
              }
+
              if(exe)
                window.o[o.data_method][exe](data,$e);
              if(t == "delete"){
@@ -21,10 +21,14 @@
 	}
 	.form_fix {
 		textarea {
-			margin-bottom: 12px;
+		    margin-bottom: 12px;
 		}
-		input {
+		input[type="text"] {
 			margin-left: 0;
+			margin-top: 0;
+		}
+		input[type="text"] + input {
+			margin-top: 12px;
 		}
 	}
 	// fixed width column with 12px gutter
@@ -4,19 +4,19 @@ class Admin::PluginsController < ApplicationController
  
  def index
  
-	@plugins = OrbitApp::Plugin::Registration.all
+  	@plugins = OrbitApp::Plugin::Registration.all

    if(!params[:show_plugin_profile].nil?)
 	
-      @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).admin_partial_path
+      @right_partial = OrbitApp::Plugin::Registration.find_by_app_name(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 = ""
-	  end
+      if !@right_partial.blank?
+        respond_to do |format|
+          format.html { redirect_to( @right_partial ) }
+          end
+        else
+        @right_partial = ""
+      end
 	  
    else
      @right_partial = ""
@@ -83,9 +83,18 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
  end
  
  def show
+    
    @user = User.find(params[:id])
+
    @plugins = OrbitApp::Plugin::Registration.all

+    @ppname = Array.new
+    @plugins.each do |aa|
+      @ppname << [aa.sort_number.to_i, [aa.name, aa.app_name, aa.intro_app_name, aa.front_partial_path]]
+    end
+    @plugin_shows = @ppname.sort.collect {|v| {"name"=>v[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} }
+
+
    @profile_data = []
    @teacher_data = []
    @student_data = []
@@ -252,7 +261,7 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
        if to_go > 0
          user_at_position = User.where(position: to_go - 1).first
          user = User.find(pair[1])
-          if user_at_position && !user_at_position == user
+          if user_at_position && !(user_at_position == user)
            if user.position > user_at_position.position
              user.move_above(user_at_position)
            else
@@ -271,11 +271,7 @@ module ApplicationHelper
  end

  def show_avatar(user)
-    if (user.avatar? rescue false)
-      image_tag(user.avatar.thumb.url)
-    else
-      image_tag "person.png"
-    end
+    image_tag(user.avatar.thumb.url)
  end

  # NTU link
@@ -21,6 +21,9 @@ class AvatarUploader < CarrierWave::Uploader::Base
  # def default_url
  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
  # end
+  def default_url
+    [version_name, (Site.first.default_image.file.url rescue "person.png")].compact.join('_')
+  end

  # Process files as they are uploaded:
  # process :scale => [200, 300]
@@ -7,8 +7,8 @@
                            <%= 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) %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %>
+                                <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.app_name) %>
                            <% end -%>    
                        <% end -%>

@@ -15,7 +15,7 @@
        <%= link_to(content_tag(:i, nil, :class => 'icon-key'),'#',:class=>"key" ) if is_admin?%>
        <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_summary, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
      </div>
-      <%= show_avatar(user_for_summary) %>
+      <%= image_tag(user_for_summary.avatar) %>
    </div>
    <div class="member-info">
      <h4 class="member-name"><%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%></h4>
@@ -16,7 +16,7 @@
        <%= link_to(content_tag(:i, nil, :class => 'icon-trash'), admin_users_new_interface_path(user_for_thumbnail, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"trash", :remote => true) if is_admin? %>
        
      </div>
-      <%= show_avatar(user_for_thumbnail) %>
+      <%= image_tag(user_for_thumbnail.avatar) %>
    </div>
    <h4 class="member-name text-center"><%= link_to user_for_thumbnail.name,admin_users_new_interface_path(user_for_thumbnail)%></h4>
  </li>
@@ -50,9 +50,9 @@
                          <a data-toggle="dropdown" class="dropdown-toggle" href="#">Module List <b class="caret"></b></a>
                          <ul class="dropdown-menu">

-                            <% @plugins.each do |plugin| %>
-                                <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %>
-                                    <%= link_to plugin.name, :show_plugin_profile => plugin.app_name %>
+                            <% @plugin_shows.each do |plugin| %>
+                                <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin["app_name"] ? "active" : nil) do %>
+                                    <%= link_to plugin["name"], :show_plugin_profile => plugin["app_name"] %>
                                <% end -%>    
                            <% end -%>

@@ -32,32 +32,32 @@
        <li class="dock_item"><a callback-method='initializePersonalExperience' href="<%= panel_personal_experience_desktop_experience_window_path %>" class="widget_fn wh2 hh2" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
        <li class="dock_item"><a callback-method='initializePersonalDiploma' href="<%= panel_personal_diploma_desktop_diploma_window_path %>" class="widget_fn wh2 hh2" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
        <li class="dock_item"><a callback-method='initializePersonalHonor' href="<%= panel_personal_honor_desktop_honor_window_path %>" class="widget_fn wh2 hh2" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="activities" class="widget_fn wh2 hh2" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="clubs" class="widget_fn wh2 hh2" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="activities" class="widget_fn wh2 hh2" id='d_activities' onclick="return false;"><span class="widget_icon disable"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="clubs" class="widget_fn wh2 hh2" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
      </ul>
      </li>
      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
      <ul class="dock_child hh2 thmc4" style="width: 180px;">
-        <li class="dock_item"><a callback-method='' href="courses" class="widget_fn wh2 hh2" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="homework" class="widget_fn wh2 hh2" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="certification" class="widget_fn wh2 hh2" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="courses" class="widget_fn wh2 hh2" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="homework" class="widget_fn wh2 hh2" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="certification" class="widget_fn wh2 hh2" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
      </ul>
      </li>
      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
      <ul class="dock_child hh2 thmc4" style="width: 300px;">
-        <li class="dock_item"><a callback-method='' href="mypage" class="widget_fn wh2 hh2" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="blog" class="widget_fn wh2 hh2" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="album" class="widget_fn wh2 hh2" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="calendar" class="widget_fn wh2 hh2" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='' href="files" class="widget_fn wh2 hh2" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="mypage" class="widget_fn wh2 hh2" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="blog" class="widget_fn wh2 hh2" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="album" class="widget_fn wh2 hh2" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="calendar" class="widget_fn wh2 hh2" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="files" class="widget_fn wh2 hh2" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
      </ul>
      </li>
      <li class="d_cate"><a callback-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh2 hh2" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
      <ul class="dock_child hh2 thmc4" style="width: 60px;">
-        <li class="dock_item"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item disable"><a callback-method='' href="" class="widget_fn wh2 hh2" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
      </ul>
      </li>
-      <li class="d_cate"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh2 hh2" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
+      <li class="d_cate  disable"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh2 hh2" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
    </ul>
    <div class="fn_des hh2 admbg admtxt"></div>
  </div>
@@ -53,6 +53,7 @@ module OrbitApp
          def initialize(name,partial=nil,*args ,&block)
            @base_path = args[0][:base_path]
            @name = partial[0][:i18n].nil? ? name : lambda{ I18n.t(partial[0][:i18n]) } 
+            @sort_number = partial[0][:sort_number]
            @app_name = partial[0][:app_name]
            @intro_app_name = partial[0][:intro_app_name]
            @partial_path = ''
@@ -68,6 +69,10 @@ module OrbitApp
            block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
          end

+          def sort_number
+            return  @sort_number
+          end
+
          def app_name
            return  @app_name
          end
@@ -84,11 +84,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController

    @bulletin.create_user_id = current_user.id
    @bulletin.update_user_id = current_user.id
-    if(is_manager? || is_admin?)
+    #if(is_manager? || is_admin?)
      @bulletin.is_checked = true
      @bulletin.is_rejected = false
      @bulletin.de_pending
-    end
+    #end

    respond_to do |format|
      if @bulletin.save
@@ -132,11 +132,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
      respond_to do |format|

        if @bulletin.update_attributes(params[:bulletin])
-          if(is_manager? || is_admin?)
+          #if(is_manager? || is_admin?)
            @bulletin.is_checked = true
            @bulletin.is_rejected = false
            @bulletin.de_pending!
-          end
+          #end
          # if (params[:bulletin][:is_checked] == "false")
          #   @bulletin.is_rejected = true
          #   @bulletin.save!
@@ -50,6 +50,13 @@ class Panel::Member::FrontEnd::MemberListsController < OrbitWidgetController

    @plugins = OrbitApp::Plugin::Registration.all

+    @ppname = Array.new
+    @plugins.each do |aa|
+      @ppname << [aa.sort_number.to_i, [aa.name, aa.app_name, aa.intro_app_name, aa.front_partial_path]]
+    end
+    @plugin_shows = @ppname.sort.collect {|v| {"name"=>v[1][0],"app_name"=>v[1][1],"intro_app_name"=>v[1][2],"front_partial_path"=>v[1][3]} }
+
+
    @profile_data = []

    attribute_values = @member.attribute_values.asc("_id")
@@ -18,6 +18,8 @@
 					<div class="o-members">

 						<% @member_status.each do |ms| %>
+
+						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
 						
 						<h3 class="o-members-category h3"><%= ms.title %></h3>
 						<ul class="o-members-list">
@@ -28,7 +30,14 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) %></li>
+									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+									   if @job_title != 'NoData' and !@job_title.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b>
+										<%= @job_title %>
+									</li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 								</ul>
@@ -40,6 +49,8 @@
 						
 						<% end %>

+						<% end %>
+
 					</div>

 	<% elsif @item.frontend_style == 'Two' or @item.frontend_style.blank? %>
@@ -52,6 +63,8 @@

 						<%  @member_status.each do |ms| %>

+						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
+
 						<h3 class="o-members-category h3"><%= ms.title %></h3>
 						<ul class="o-members-list">

@@ -61,7 +74,11 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale)) %></li>
+									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+									   if @job_title != 'NoData' and !@job_title.blank?
+									%>
+									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= @job_title %></li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 								</ul>
@@ -73,6 +90,8 @@

 						<% end %>

+						<% end %>
+
 					</div>

 	<% end %>
@@ -43,29 +43,29 @@
 	</div>

    <div class="member-pic">
-     <%= show_avatar(@member) %>
+     <%= image_tag(@member.avatar) %>
    </div>

 	<div class="member-module">
 		<div class="module-nav">
 			<ul>
 				<%
-				  @plugins.each do |plugin| 
+				  @plugin_shows.each do |plugin| 

-				  @data = plugin.app_name.classify.constantize.where(is_hidden: false, :create_user_id=>@member.id)
-				  @intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first
+				  @data = plugin["app_name"].classify.constantize.where(is_hidden: false, :create_user_id=>@member.id)
+				  @intro_data = plugin["intro_app_name"].classify.constantize.where(:user_id=>@member.id).first
 				%>

 					<% if !@intro_data.blank? %>

 						<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
-						  <li><a href="#<%= plugin.name %>"><%= plugin.name %></a></li>
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>

 					<% else %>

 						<% if !@data.blank? %>
-						  <li><a href="#<%= plugin.name %>"><%= plugin.name %></a></li>
+						  <li><a href="#<%= plugin["name"].gsub(' ', '') %>"><%= plugin["name"] %></a></li>
 						<% end %>

 					<% end %>
@@ -75,18 +75,18 @@
 		</div>
 		<div class="module-content">
 			<%
-			  @plugins.each do |plugin|
+			  @plugin_shows.each do |plugin|

-				@plugin_partial = !plugin.front_partial_path.blank? ? OrbitApp::Plugin::Registration.find_by_key(plugin.name).front_partial_path : nil
+				@plugin_partial = !plugin["front_partial_path"].blank? ? OrbitApp::Plugin::Registration.find_by_key(plugin["name"]).front_partial_path : nil

-				@data = plugin.app_name.classify.constantize.where(:create_user_id=>@member.id)
-				@intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first
+				@data = plugin["app_name"].classify.constantize.where(:create_user_id=>@member.id)
+				@intro_data = plugin["intro_app_name"].classify.constantize.where(:user_id=>@member.id).first
 			%>

 				<% if !@intro_data.blank? %>

 					<% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %>
-						<div class="module-pane" id="<%= plugin.name %>">
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>
@@ -94,7 +94,7 @@
 				<% else %>

 					<% if !@data.blank? %>
-						<div class="module-pane" id="<%= plugin.name %>">
+						<div class="module-pane" id="<%= plugin["name"].gsub(' ', '') %>">
 							<%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
 						</div>					
 					<% end %>
@@ -4,10 +4,13 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper
     "item" => "true",
     "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
-        marker(publication.id) + \
-        content(publication, view) + \
-        edit_or_delete(publication)
+       content_tag :div,
+        :class => "inner" do
+          marker(publication.id) + \
+          content(publication, view) + \
+          edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_book_back_end_writing_book_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_author_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_book, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_book_back_end_writing_book_paper_type_quick_edit_path(list_paper_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_paper_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_book, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -21,14 +21,14 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+   <ul class="s_form" isotope="true">
+        <li class="s_grid_row" >
            <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>  >
+         
+           <div class="form_fix" <%= style %> <%= data %>>
            <%= f.fields_for :paper_title_translations do |f| %>
              <%= f.text_area locale,
                class: "s_grid_12 s_grid s_grid_h_3",
@@ -36,8 +36,7 @@
                placeholder: t("personal_book.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
                value: (@personal_book.paper_title_translations[locale.to_s] rescue nil) %>
            <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %> >
+         
               <%= f.fields_for :book_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -45,8 +44,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@personal_book.book_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %> >
+             
               <%= f.fields_for :extracted_chapters_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -54,8 +52,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@personal_book.extracted_chapters_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %> >
+         
               <%= f.fields_for :publishers_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -63,8 +60,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@personal_book.publishers_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+              </div>
            <% end %>
+          </li>
            <li class="s_grid_row">
              <%= label_tag("", t("personal_book.book_paper_type"), class: "s_grid_4 s_grid") %>
              <%= f.select :book_paper_type_id, BookPaperType.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@@ -107,12 +105,7 @@
              <%= label_tag("", t("personal_book.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
            </li>
            
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+        
            <li class="s_grid_row">
              <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_book.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
            </li>
@@ -127,14 +120,9 @@
                 <%= label_tag("", t("personal_book.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%>
             </li>
             <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
            </li>
-          </ul>
-        </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+        
          <li class="s_grid_row">
          <table class="s_table">
            <thead>
@@ -165,8 +153,7 @@
          </table>
          </li>
        </ul>
-      </div>
-    </div>
+
 </div>
 <script>
  var get_html = function(old_id,new_id){
@@ -61,8 +61,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="books_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @writing_books.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="books_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @writing_books.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalBook
  OrbitApp.registration "PersonalBook",:type=> 'ModuleApp' do
    module_label 'module_name.personal_book'
    base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true, :app_name=>"WritingBook", :intro_app_name=>"PersonalBookIntro",:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book'
+    personal_plugin :enable => true, :sort_number => '25', :app_name=>"WritingBook", :intro_app_name=>"PersonalBookIntro",:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book'



@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_conference_back_end_writing_conference_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action">編輯</a>
-		<%= link_to show_toggle_archive_btn(list_author_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_conference, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_conference_back_end_writing_conference_paper_type_quick_edit_path(list_paper_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action">編輯</a>
-		<%= link_to show_toggle_archive_btn(list_paper_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_conference, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -29,14 +29,13 @@
    </div>
  </div>
  <div class="viewport"> -->
-    <div class="overview" content-layout="column" base-width="420">
-      <div column="true">
-        <div class="s_form">
-          <ul>
+    <div class="overview" content-layout="simple" base-width="420">
+       <ul class="s_form" isotope="true">
+            <li class="s_grid_row" >
            <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
            <%= f.fields_for :paper_title_translations do |f| %>
              <%= f.text_area locale,
                class: "s_grid_12 s_grid_h_2 s_grid",
@@ -44,8 +43,6 @@
                placeholder: t("personal_conference.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
                value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %>
            <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
            <%= f.fields_for :conference_title_translations do |f| %>
              <%= f.text_field locale,
                size: "20",
@@ -53,8 +50,9 @@
                class: "s_grid_12 s_grid",
                value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %>
            <% end %>
-            </li>
+          </div>
            <% end %>
+          </li>
            <li class="s_grid_row">
            <div>
              <%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %>
@@ -99,11 +97,7 @@
            <li class="s_grid_row">
            <%= label_tag("", t("personal_conference.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%>
            </li>
-          </ul>
-        </div>
-        <div column="true">
-          <div class="s_form">
-            <ul>
+         
              <li class="s_grid_row">
              <%= f.text_area :author_tokens,
                class: "s_grid_12 s_grid",
@@ -155,12 +149,7 @@
          </li>

          <li class="s_grid_row"><input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_conference.tags") %>></li>
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
            <li class="s_grid_row">
            <table class="s_table">
              <thead>
@@ -190,22 +179,16 @@
              </tbody>
            </table>
            </li>
-          </ul>
-        </div>
-        <div column="true">
-          <ul class="s_form">
-              <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid"%>
-            </li>
-          </ul>
-        </div>
-        <div column="true">
-          <ul class="s_form">
+        
            <li class="s_grid_row">
-              <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid"%>
+            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
+            </li>
+        
+            <li class="s_grid_row">
+              <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
            </li>
          </ul>
-        </div>
+
      </div>
  <!-- </div>
 </div> -->
@@ -2,7 +2,7 @@ module PersonalConference
  OrbitApp.registration "PersonalConference",:type=> 'ModuleApp' do
    module_label 'module_name.personal_conference'
    base_url File.expand_path File.dirname(__FILE__)
-    personal_plugin :enable => true, :app_name=>"WritingConference", :intro_app_name=>"PersonalConferenceIntro",:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference'
+    personal_plugin :enable => true, :sort_number => '10', :app_name=>"WritingConference", :intro_app_name=>"PersonalConferenceIntro",:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference'



@@ -4,10 +4,13 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper
     "item" => "true",
       "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -21,10 +21,8 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-      <div class="s_form">
-        <ul>
+<div class="overview" content-layout="simple" base-width="420">
+        <ul class="s_form" isotope="true">
          <li class="s_grid_row">
                <%= label_tag("", t("personal_diploma.start_date"), class: "s_grid_4 s_grid") %>
                <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -35,10 +33,11 @@
                <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
                <%= f.date_select :end_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
            </li>
+            <li class="s_grid_row">
             <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+               <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :school_name_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -46,8 +45,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@diploma.school_name_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+           
               <%= f.fields_for :country_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -55,8 +53,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@diploma.country_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+   
               <%= f.fields_for :department_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -64,8 +61,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@diploma.department_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+    
               <%= f.fields_for :degree_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -73,8 +69,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@diploma.degree_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
            <li class="s_grid_row">
              <%= label_tag("", t("personal_diploma.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
            </li>
@@ -85,16 +82,10 @@
                <%= f.label :language, t("personal_diploma.language"), :class => "s_grid s_grid_4" %>
                <%= f.select :language, Diploma::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
             <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
            </li>
        </ul>
-       </div>
-    </div>
+
 </div>
@@ -60,8 +60,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="diploma_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @diplomas.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="diploma_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @diplomas.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalDiploma
  OrbitApp.registration "PersonalDiploma",:type=> 'ModuleApp' do
    module_label 'module_name.personal_diploma'
    base_url File.expand_path File.dirname(__FILE__)    
-    personal_plugin :enable => true, :app_name=>"Diploma", :intro_app_name=>"PersonalDiplomaIntro",:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma'
+    personal_plugin :enable => true, :sort_number => '40', :app_name=>"Diploma", :intro_app_name=>"PersonalDiplomaIntro",:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma'



@@ -4,10 +4,13 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper
     "item" => "true",
      "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_experience_back_end_experience_experience_category_quick_edit_path(list_experience_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_experience_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_experience, :back_end, list_experience_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -21,14 +21,13 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+       <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
             <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :organizationt_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -36,8 +35,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@experience.organizationt_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
               <%= f.fields_for :department_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -45,8 +43,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@experience.department_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+         
               <%= f.fields_for :job_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -54,8 +51,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@experience.job_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
            <li class="s_grid_row">
              <%= label_tag("", t("personal_experience.experience_category"), class: "s_grid_4 s_grid") %>
              <%= f.select :experience_category_id, ExperienceCategory.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@@ -80,16 +78,9 @@
                <%= f.label :language, t("personal_experience.language"), :class => "s_grid s_grid_4" %>
                <%= f.select :language, Experience::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
-             </ul>
-          </div>
-       </div>
-        <div column="true">
-          <div class="s_form">
-            <ul>
+       
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
            </li>
        </ul>
-      </div>
-    </div>
 </div>
@@ -61,8 +61,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="experience_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @experiences.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="experience_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @experiences.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalExperience
  OrbitApp.registration "PersonalExperience",:type=> 'ModuleApp' do
    module_label 'module_name.personal_experience'
    base_url File.expand_path File.dirname(__FILE__)   
-    personal_plugin :enable => true, :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience'
+    personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience'



@@ -4,10 +4,13 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper
     "item" => "true",
       "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_honor_back_end_honor_honor_category_quick_edit_path(list_honor_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_honor_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_honor, :back_end, list_honor_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -21,11 +21,9 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
-           <li class="s_grid_row">
+<div class="overview" content-layout="simple" base-width="420">
+    <ul class="s_form" isotope="true">
+            <li class="s_grid_row" >
              <%= label_tag("", t("personal_honor.award_name"), class: "s_grid_4 s_grid") %><%= f.text_field :award_name, size: "20", class: "s_grid_8 s_grid"%>
            </li>
            <li class="s_grid_row">
@@ -49,16 +47,10 @@
                <%= f.label :language, t("personal_honor.language"), :class => "s_grid s_grid_4" %>
                <%= f.select :language, Honor::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
-        </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+   
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
            </li>
        </ul>
-      </div>
-    </div>
+  
 </div>
@@ -59,8 +59,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="honor_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @honors.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="honor_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @honors.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalHonor
  OrbitApp.registration "PersonalHonor",:type=> 'ModuleApp' do
    module_label 'module_name.personal_honor'
    base_url File.expand_path File.dirname(__FILE__)  
-    personal_plugin :enable => true, :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor'
+    personal_plugin :enable => true, :sort_number => '50', :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor'



@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_author_type_quick_edit_path(list_author_type) %>#myModal2" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_author_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_journal, :back_end, list_author_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_level_type_quick_edit_path(list_level_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_level_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_paper_type_quick_edit_path(list_paper_type) %>#myModal3" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_paper_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_journal, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -5,7 +5,7 @@
 		<td>
 		
 		<a href="<%= panel_personal_journal_back_end_writing_journal_level_type_quick_edit_path(list_level_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action">編輯</a>
-		<%= link_to show_toggle_archive_btn(list_level_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle" %>
 		</td>
 	</tr>
@@ -44,7 +44,7 @@
                placeholder: t("personal_journal.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
                value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %>
            <% end %>
-            <p></p>
+
            <%= f.fields_for :journal_title_translations do |f| %>
              <%= f.text_field locale,
                size: "20",
@@ -1,6 +1,6 @@
 zh_tw:
  module_name:
-    personal_journal: 期刊著作
+    personal_journal: 期刊論文
  personal_journal:
    paper_title : "論文名稱"
    journal_title : "期刊名稱"
@@ -2,7 +2,7 @@ module PersonalJournal
  OrbitApp.registration "PersonalJournal",:type=> 'ModuleApp' do
    module_label 'module_name.personal_journal'
    base_url File.expand_path File.dirname(__FILE__)  
-    personal_plugin :enable => true, :app_name=>"WritingJournal", :intro_app_name=>"PersonalJournalIntro",:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal'
+    personal_plugin :enable => true, :sort_number => '5', :app_name=>"WritingJournal", :intro_app_name=>"PersonalJournalIntro",:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal'



@@ -4,10 +4,13 @@ module Panel::PersonalLab::Desktop::PersonalLabsHelper
     "item" => "true",
     "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -21,14 +21,13 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+  <ul class="s_form" isotope="true">
+      <li class="s_grid_row">
            <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-           <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :lab_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -36,8 +35,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@lab.lab_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+           
               <%= f.fields_for :location_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -45,8 +43,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@lab.location_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
               <%= f.fields_for :participating_professor_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -54,8 +51,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@lab.participating_professor_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+         
               <%= f.fields_for :participating_student_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -63,8 +59,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@lab.participating_student_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
            <li class="s_grid_row">
              <%= label_tag("", t("personal_lab.extension_no"), class: "s_grid_4 s_grid") %><%= f.text_field :extension_no, size: "20", class: "s_grid_8 s_grid"%>
            </li>
@@ -81,12 +78,7 @@
            <li class="s_grid_row">
              <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_lab.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
            </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+          
            <li class="s_grid_row">
              <%= label_tag("", t("personal_lab.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
            </li>
@@ -95,14 +87,8 @@
                <%= f.select :language, Lab::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
             <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
-            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
+       
          <li class="s_grid_row">
          <table class="s_table">
            <thead>
@@ -133,8 +119,7 @@
          </table>
          </li>
        </ul>
-      </div>
-    </div>
+      
 </div>
 <script>
  var get_html = function(old_id,new_id){
@@ -61,8 +61,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="lab_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @labs.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="lab_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @labs.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalLab
  OrbitApp.registration "PersonalLab",:type=> 'ModuleApp' do
    module_label 'module_name.personal_lab'
    base_url File.expand_path File.dirname(__FILE__)   
-    personal_plugin :enable => true, :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab'
+    personal_plugin :enable => true, :sort_number => '30', :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab'
    

  end
@@ -4,10 +4,13 @@ module Panel::PersonalPatent::Desktop::PersonalPatentsHelper
     "item" => "true",
     "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_patent_back_end_writing_patent_writing_patent_category_quick_edit_path(list_patent_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_patent_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_patent, :back_end, list_patent_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -21,14 +21,13 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+ <ul class="s_form" isotope="true">
+    <li class="s_grid_row">
          <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-           <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :patent_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -36,8 +35,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@patent.patent_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
              <li class="s_grid_row">
              <%= label_tag("", t("personal_patent.patent_no"), class: "s_grid_4 s_grid") %><%= f.text_field :patent_no, size: "20", class: "s_grid_8 s_grid"%>
            </li>
@@ -67,21 +67,10 @@
                <%= f.label :language, t("personal_patent.language"), :class => "s_grid s_grid_4" %>
                <%= f.select :language, WritingPatent::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
-            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
+       
          <li class="s_grid_row">
          <table class="s_table">
            <thead>
@@ -112,8 +101,7 @@
          </table>
          </li>
        </ul>
-      </div>
-    </div>
+   
 </div>
 <script>
  var get_html = function(old_id,new_id){
@@ -60,8 +60,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="patent_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @patents.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="patent_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @patents.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalPatent
  OrbitApp.registration "PersonalPatent",:type=> 'ModuleApp' do
    module_label 'module_name.personal_patent'
    base_url File.expand_path File.dirname(__FILE__) 
-    personal_plugin :enable => true, :app_name=>"WritingPatent", :intro_app_name=>"PersonalPatentIntro",:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent'
+    personal_plugin :enable => true, :sort_number => '35', :app_name=>"WritingPatent", :intro_app_name=>"PersonalPatentIntro",:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent'



@@ -5,10 +5,13 @@ module Panel::PersonalProject::Desktop::PersonalProjectsHelper
     "item" => "true",
     "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -5,7 +5,7 @@
 		<td class="span2">
 		
 		<a href="<%= panel_personal_project_back_end_project_project_category_quick_edit_path(list_project_type) %>#myModal1" data-toggle="modal" data-remote="true" class="action"><%= t('edit')%></a>
-		<%= link_to show_toggle_archive_btn(list_project_type), 
+		<%= link_to 'Delete', 
 			polymorphic_path([:panel, :personal_project, :back_end, list_project_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %>
 		</td>
 	</tr>
@@ -21,14 +21,13 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+     <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
            <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :project_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -36,8 +35,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@project.project_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+        
               <%= f.fields_for :job_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -45,8 +43,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@project.job_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+           
               <%= f.fields_for :participator_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -54,8 +51,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@project.participator_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
               <%= f.fields_for :unit_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -63,8 +59,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@project.unit_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
             <li class="s_grid_row">
                <%= label_tag("", t("personal_project.start_date"), class: "s_grid_4 s_grid") %>
                <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -86,12 +83,7 @@
             <li class="s_grid_row">
              <%= label_tag("", t("personal_project.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
            </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+       
             <li class="s_grid_row">
              <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_project.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
            </li>
@@ -100,23 +92,13 @@
                <%= f.select :language, Project::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>             
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7 s_grid_h_full"%>
            </li>
-        </ul>
-      </div>
-    </div>
-    <div column="true">
-        <div class="s_form">
-          <ul>
+   
             <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%>
+            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+     
          <li class="s_grid_row">
          <table class="s_table">
            <thead>
@@ -147,8 +129,6 @@
          </table>
          </li>
        </ul>
-      </div>
-    </div>
 </div>
 <script>
  var get_html = function(old_id,new_id){
@@ -61,8 +61,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="project_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @projects.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="project_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @projects.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -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, :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'
+    personal_plugin :enable => true, :sort_number => '15', :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'



@@ -5,10 +5,13 @@ module Panel::PersonalResearch::Desktop::PersonalResearchsHelper
      "item" => "true",
     "data-id" => publication.id.to_s,
      :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+       content_tag :div,
+        :class => "inner" do
         marker(publication.id) + \
        content(publication, view) + \
        edit_or_delete(publication)
      end
+    end
  end

  def marker id
@@ -21,14 +21,13 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-<div class="overview" content-layout="column" base-width="420">
-    <div column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+   <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
            <% @site_valid_locales.each_with_index do |locale, i| %>
              <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
              <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+               <div class="form_fix" <%= style %> <%= data %>>
               <%= f.fields_for :research_title_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -36,8 +35,7 @@
                    class: "s_grid_12 s_grid",
                    value: (@research.research_title_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+           
               <%= f.fields_for :extracted_chapters_translations do |f| %>
                  <%= f.text_field locale,
                    size: "20",
@@ -45,8 +43,9 @@
                    class: "s_grid_12 s_grid",
                    value: (@research.extracted_chapters_translations[locale.to_s] rescue nil) %>
                <% end %>
-            </li>
+            </div>
            <% end %>
+          </li>
             <li class="s_grid_row">
                <%= label_tag("", t("personal_research.publication_date"), class: "s_grid_4 s_grid") %>
                <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -63,14 +62,9 @@
                <%= f.select :language, Research::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
             </li>
             <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+   
          <li class="s_grid_row">
          <table class="s_table">
            <thead>
@@ -101,8 +95,6 @@
          </table>
          </li>
        </ul>
-      </div>
-    </div>
 </div>
 <script>
  var get_html = function(old_id,new_id){
@@ -61,8 +61,10 @@
    <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
  </div>
 </div>
-    <div class="overview" page-name="research_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
-      <% @researches.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="research_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @researches.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
    </div>
@@ -2,7 +2,7 @@ module PersonalResearch
  OrbitApp.registration "PersonalResearch",:type=> 'ModuleApp' do
    module_label 'module_name.personal_research'
    base_url File.expand_path File.dirname(__FILE__)   
-    personal_plugin :enable => true, :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research'
+    personal_plugin :enable => true, :sort_number => '20', :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research'
    


@@ -21,6 +21,7 @@ function setData(l, length, optionsI, className) {
 		radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]";
 	data = {
 		_l: l,
+		_ques: "new",
 		_length: length,
 		_className: className,
 		_destroy: [id+l+"_destroy", name+l+"][_destroy]"],
@@ -48,6 +49,7 @@ function setEditData(l, length, d, optionsI, className) {
 		radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]";
 	data = {
 		_l: l,
+		_ques: "old",
 		_length: length,
 		_className: className,
 		_destroy: [id+l+"__destroy", name+l+"][_destroy]"],
@@ -75,11 +77,14 @@ function setEditQuestionAttributes(l, length, d, optionsI, className) {
 		radiogroupsID = l+"_survey_question_radiogroups_attributes_"+optionsI+"_name_translations_",
 		radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]",
 		option_id = l+"][survey_question_options_attributes]["+optionsI+"][id]",
+		destroy = l+"][survey_question_options_attributes]["+optionsI+"][_destroy]",
 		radiogroups_id = l+"][survey_question_radiogroups_attributes]["+optionsI+"][id]";
 	data = {
 		_l: l,
 		_length: length,
+		_ques: "old",
 		_className: className,
+		_destroy: [name+destroy],
 		_option: [id+optionID, name+optionName, "attributes_"+l+"_options_"+optionsI+"_", d.name_translations],
 		_radiogroups: [id+radiogroupsID, name+radiogroupsName, "attributes_"+l+"_radiogroups_"+optionsI+"_",d.name_translations],
 		_options_id: [name+option_id,d._id],
@@ -93,7 +98,12 @@ function inputAppendLength(element, length) {
 	if(length == 2) {
 		element.closest('.add-target').find('.remove-input').addClass('hide').prev().addClass('last');
 	}
-	element.closest('.input-append').remove();
+	var option = element.closest('.input-append');
+	if( option.data( 'question-option' ) == "old" ){
+		option.hide().removeAttr( 'question-option' ).find( "input.should_destroy_option" ).val("1");
+	} else if( option.data( "question-option" ) == "new"){
+		option.remove();
+	}
 }

 function editQuestion (dataArray){
@@ -165,7 +175,7 @@ $(function() {
 		};
 	});
 	$('.add-question').on(clickEvent, function(event) {
-		$('#template-survery').tmpl(setData(l, $('.questions > .attributes').length + 1)).appendTo($('.questions'));
+		$('#template-survery').tmpl(setData(l, $('.questions > .attributes[data-question]').length + 1)).appendTo($('.questions'));
 		checkQuestionsLength();
 		textareaResizable(); // from textarea-lang-btn.js
 		l += 1;
@@ -207,14 +217,26 @@ $(function() {
 			inputAppendLength($(this), $(this).closest('.add-target').children('.input-append').length);
 		} else if($(this).hasClass('delete')) {
 			$(this).closest('.attributes').fadeOut(300, function() {
-				$(this).hide();
-				$( this ).find( '.should_destroy' ).val(1);
-				checkQuestionsLength();
-				$('.questions .attributes').each(function(index, el) {
-					$( this ).find( "input.sequence" ).val( index );
-					$( this ).find( "h4 span:eq(0)" ).text( index + 1 );
-					$( this ).attr( "data-index", index );
-				});
+				if( $( this ).data( 'question' ) == "old" ){
+					$(this).hide().removeAttr('data-question');
+					$( this ).find( '.should_destroy' ).val(1);
+					l--;
+					checkQuestionsLength();
+					$('.questions .attributes[data-question]').each(function(index, el) {
+						$( this ).find( "input.sequence" ).val( index );
+						$( this ).find( "h4 span:eq(0)" ).text( index + 1 );
+						$( this ).attr( "data-index", index );
+					});
+				} else if( $( this ).data( 'question' ) == "new" ){
+					$( this ).remove();
+					l--;
+					checkQuestionsLength();
+					$('.questions .attributes[data-question]').each(function(index, el) {
+						$( this ).find( "input.sequence" ).val( index );
+						$( this ).find( "h4 span:eq(0)" ).text( index + 1 );
+						$( this ).attr( "data-index", index );
+					});
+				}
 			});
 		} else if($(this).hasClass('icon-caret-up') || $(this).hasClass('icon-caret-down')) {
 			if($(this).hasClass('icon-caret-up')) {
@@ -236,7 +258,7 @@ $(function() {
 			$('#template-survery-option').tmpl(setData(_index, "", _i, _className)).insertBefore($(this).closest('.add-btn'));
 			$(this).closest('.add-target').find('.input-append').find('.remove-input').removeClass('hide').prev().removeClass('last');
 			_i += 1
-			$(this).closest('.control-group').data('index', _i)
+			$(this).closest('.control-group').data('index', _i);
 		}
 		event.preventDefault();
 	});
@@ -1,11 +1,11 @@
 <script id="template-survery" type="text/x-tmpl">
-  <div class="attributes" data-index="${_l}">
+  <div class="attributes" data-index="${_l}" data-question="${_ques}">
    <div class="attributes-header clearfix">
      <a class="btn btn-mini pull-right btn-danger delete" href="#"><i class="icon-trash"></i> Delete</a>
      <input class="should_destroy" id="${_destroy[0]}" name="${_destroy[1]}" type="hidden">
      <input id="${_sequence[0]}" class="sequence" name="${_sequence[1]}" type="hidden" value="${_sequence[2]}">
      {{if _id}}
-        <input id="${_id[0]}" class="sequence" name="${_id[1]}" type="hidden" value="${_id[2]}">
+        <input id="${_id[0]}" name="${_id[1]}" type="hidden" value="${_id[2]}">
      {{/if}}
      <h4><b></b> Q<span>${_length}</span> <i class="icon-caret-up"></i> <span class="questions-title">${_title_translations[3].en}</span></h4>
    </div>
@@ -123,9 +123,10 @@

 <script id="template-survery-option" type="text/x-tmpl">
 {{if _className == 'rgl'}}
-  <div class="input-append">
+  <div class="input-append" data-question-option="${_ques}">
    {{if _radiogroups_id}}
      <input type="hidden" value="${_radiogroups_id[1]}" name="${_radiogroups_id[0]}" />
+      <input type="hidden" class="should_destroy_option" name="${_destroy[0]}" />
    {{/if}}
    <div class="tab-content">
      <div class="tab-pane fade active in" id="${_radiogroups[2]+'en'}">
@@ -144,9 +145,10 @@
    </div>
  </div>
 {{else}}
-  <div class="input-append">
+  <div class="input-append" data-question-option="${_ques}">
   {{if _options_id}}
      <input type="hidden" value="${_options_id[1]}" name="${_options_id[0]}" />
+       <input type="hidden" class="should_destroy_option" name="${_destroy[0]}" />
    {{/if}}
    <div class="tab-content">
      <div class="tab-pane fade active in" id="${_option[2]+'en'}">
Author	SHA1	Message	Date
harrybomrah	648ecc1475	isotope fixed for all plugins for list and form.	2013-10-01 14:29:39 +08:00
saurabhbhatia	9f490c87d2	Fixed issue with member plugin delete label	2013-10-01 10:43:37 +08:00
saurabhbhatia	a9431ad17e	Updated Bulletins controller with announcement approval fix	2013-10-01 10:03:18 +08:00
saurabhbhatia	d9ac24470f	Updated Member plugin names to remove spaces and generate correct links	2013-09-30 18:25:18 +08:00
harrybomrah	2f673b20ad	disabling changes in desktop, missed out in last one	2013-09-30 17:25:02 +08:00
harrybomrah	0a9fd6a4b5	some needed changes in api for desktop	2013-09-30 16:59:50 +08:00
harrybomrah	74ca99a581	delete and sequencing fixed for survey questions	2013-09-30 16:49:27 +08:00
chris	dfec6f7642	Fix for user order	2013-09-27 12:46:19 +08:00
Spen	9186978551	new ui member plugin sort fix and user show avatar fix	2013-09-27 11:04:52 +08:00