Fix tag to remove ['0', '1'] from the form

This reverts commit b18e61a6c0.

app/assets/javascripts/desktop/orbitdesktop.js

@@ -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 $e = $(this),
-      var t = $e.attr("ajax-remote");
+          t = $e.attr("ajax-remote"),
-      var classes_to_toggle = $e.attr("toggle-onclick");
+          classes_to_toggle = $e.attr("toggle-onclick"),
-      var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
+          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"){

app/assets/stylesheets/basic/global.css

@@ -83,6 +83,7 @@ legend {
   min-width: 61px;
   z-index: 1030;
   position: fixed;
+  padding-top: 40px;
   background-color: #171717;
   -webkit-box-shadow: inset -1px 0px 10px #000000;
      -moz-box-shadow: inset -1px 0px 10px #000000;
@@ -91,12 +92,14 @@ legend {
 }
 #sidebar #sidebar-menu {
   position: absolute;
-  top: 88px;
+  top: 85px;
   bottom: 0;
-  z-index: 1;
+  z-index: 0;
   display: block;
   width: 61px;
-  /*overflow: auto;*/
+}
+#sidebar #sidebar-menu.nano {
+  top: 0;
 }
 #sidebar .scroller {
   position: absolute;
@@ -120,16 +123,12 @@ legend {
   list-style: none;
 }
 #sidebar > h2.position {
-  top: 40px;
   margin: 0;
   width: 61px;
   color: #FFFFFF;
   font-weight: normal;
-  font-size: 2.4em;
-  line-height: 47px;
-  line-height: 46px\9;
   text-align: center;
-  position: absolute;
+  position: relative;
   background-color: #08c;
   background-image: -moz-linear-gradient(top, #08c, #006091);
   background-image: -ms-linear-gradient(top, #08c, #006091);
@@ -158,24 +157,20 @@ legend {
 }
 #sidebar > h2.position a {
   color: #FFFFFF;
-  padding: 6px 6px 5px;
   text-decoration: none;
+  display: inline-block;
   -webkit-text-shadow: 0px -1px 0px #333333;
      -moz-text-shadow: 0px -1px 0px #333333;
        -o-text-shadow: 0px -1px 0px #333333;
           text-shadow: 0px -1px 0px #333333;
 }
+#sidebar > h2.position a i {
+  line-height: 45px;
+}
 #sidebar .sidebar-nav > li {
   min-width: 61px;
-  height: 45px;
 }
-#sidebar .sidebar-nav > li.active {
+#sidebar .sidebar-nav > li.active span {
-  font-size: 1.2em;
-}
-#sidebar .sidebar-nav > li.active .sub-nav-block {
-  display: block;
-}
-#sidebar .sidebar-nav > li.active > a > span {
   color: #FFFFFF;
   cursor: pointer;
   -webkit-text-shadow: 0px -1px 0px #636363;
@@ -183,8 +178,7 @@ legend {
        -o-text-shadow: 0px -1px 0px #636363;
           text-shadow: 0px -1px 0px #636363;
 }
-#sidebar .sidebar-nav > li > a > span {
+#sidebar .sidebar-nav > li span {
-  padding: 10px;
   color: #B0B0B0;
   display: block;
   -webkit-text-shadow: 0px 1px 0px #000000;
@@ -192,8 +186,15 @@ legend {
        -o-text-shadow: 0px 1px 0px #000000;
           text-shadow: 0px 1px 0px #000000;
 }
-#sidebar .sidebar-nav > li > a > span > i {
+#sidebar .sidebar-nav > li a {
-  font-size: 1.7em;
+  display: block;
+}
+#sidebar .sidebar-nav > li i {
+  font-size: 1.6em;
+  line-height: 45px;
+}
+#sidebar .sidebar-nav > li.active i {
+  font-size: 2.2em;
 }
 #sidebar .sub-nav-block-list {
   top: 40px;
@@ -274,7 +275,7 @@ legend {
 }
 #sidebar .sub-nav-arrow {
   left: 53px;
-  top: -10px;
+  top: -16px;
   width: 0px;
   height: 0px;
   z-index: -1;
@@ -282,7 +283,6 @@ legend {
   border-style: solid;
   border-width: 8px 8px 8px 0;
   border-color: transparent #0088CC transparent transparent;
-  display: none\9; /* 用IE的去死 */
 }
 
 
@@ -300,14 +300,15 @@ legend {
   position: absolute;
   z-index: 100;
   width: 100%;
-  border-radius: 1px;
+  border-radius: 50%/1px;
-  background-color: rgba(0, 136, 204, .3);
+  background-color: rgba(0, 136, 204, .6);
 }
 
 
 /* Main Wrap */
 #main-wrap {
   padding-top: 40px;
+  position: relative;
 }
 #main-wrap .wrap-inner {
   padding: 60px 20px 20px;
@@ -419,6 +420,7 @@ legend {
 /* Search Clear */
 .searchClear {
   position: relative;
+  display: inline-block;
 }
 .searchClear .icon-search {
   position: absolute;
@@ -520,10 +522,9 @@ legend {
   padding: 0px 5px;
   position: absolute;
   z-index: 9999;
-  max-width: 500px;
+  max-width: 300px;
   border-radius: 3px;
   background-color: #0088CC;
-  white-space: nowrap;
 }
 #sideset .ui-tooltip.sidebar-tooltip:after {
   display: none;
@@ -533,10 +534,9 @@ legend {
   padding: 0px 5px;
   position: absolute;
   z-index: 9999;
-  max-width: 500px;
+  max-width: 300px;
   border-radius: 3px;
   background-color: #000000;
-  white-space: nowrap;
 }
 .ui-tooltip:after {
   content: '';
@@ -551,6 +551,135 @@ legend {
   border-color: #000000 transparent transparent transparent;
 }
 
+/* Sign In */
+#sign-in {
+  background-color: #F3F3F3;
+  background-repeat: no-repeat;
+  background : -webkit-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -moz-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -o-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+  background : -ms-radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%); 
+  background : -radial-gradient(center center,circle cover, #F3F3F3 10%, #DBDBDB 100%);
+}
+.sign-in {
+  text-align: center;
+  position: relative;
+  width: 300px;
+  margin: 150px auto 0;
+}
+.sign-in .other-sign-in {
+  display: none;
+}
+.sign-in .login-logo {
+  margin: 0;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #ededed;
+}
+.sign-in .alert {
+  box-shadow: 0 3px 10px #CBCBCB;
+  text-align: left;
+}
+.sign-in .form {
+  background-color: #FFF;
+  box-shadow: 0 10px 20px #CBCBCB;
+  padding: 15px;
+  margin-bottom: 20px;
+}
+.sign-in .form-block {
+  overflow: hidden;
+}
+.sign-in .form-list {
+  width: 555px;
+}
+.sign-in .content {
+  float: left;
+  margin-bottom: 0;
+  position: relative;
+}
+.sign-in .content + .content {
+  margin-left: 15px;
+}
+.sign-in .control-group {
+  position: relative;
+  width: 270px;
+  margin: 0;
+}
+.sign-in .control-group label {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 39px;
+  height: 40px;
+  line-height: 40px;
+  margin: 0;
+  color: #5C5C5C;
+}
+.sign-in .control-group input {
+  width: 222px;
+  height: 30px;
+  padding: 4px 6px 4px 40px;
+  margin-bottom: 25px;
+}
+.sign-in .btn {
+  padding: 4px 0;
+  display: block;
+  width: 100%;
+  margin-bottom: 10px;
+}
+.sign-in .other-sign-in {
+  position: relative;
+  margin-top: 20px;
+  margin-bottom: 30px;
+  padding-bottom: 20px;
+  border-bottom: 1px solid #ededed;
+}
+.sign-in .other-sign-in p {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  background-color: #FFF;
+  padding: 0 10px;
+  margin-bottom: 0;
+  margin-left: -25px;
+  line-height: 30px;
+  left: 50%;
+  bottom: -15px;
+  font-size: 1.3em;
+  color: #b1b1b1;
+}
+.sign-in .checkbox {
+  position: absolute;
+  text-align: left;
+  bottom: 37px;
+}
+.sign-in .switchboard {
+  color: #08C;
+  cursor: pointer;
+}
+.sign-in .switchboard span,
+.sign-in .switchboard.active i {
+  display: inline;
+}
+.sign-in .switchboard.active span,
+.sign-in .switchboard i {
+  display: none;
+}
+.register {
+  box-shadow: inset 0 5px 5px #E0E0E0;
+  background-color: #eee;
+  padding: 15px;
+  margin: 15px -15px -15px;
+}
+.register .btn {
+  margin: 0;
+}
+.have-other-sign-in {
+  margin: 80px auto 0;
+}
+.have-other-sign-in .other-sign-in {
+  display: block;
+}
+
 /* IE go die */
 :root #sidebar .sub-nav-block:before {
   display: block\9;

app/assets/stylesheets/desktop/desktop-component.scss

@@ -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

app/controllers/admin/plugins_controller.rb

@@ -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?
+      if !@right_partial.blank?
-	    respond_to do |format|
+        respond_to do |format|
-	      format.html { redirect_to( @right_partial ) }
+          format.html { redirect_to( @right_partial ) }
-        end
+          end
-      else
+        else
-	    @right_partial = ""
+        @right_partial = ""
-	  end
+      end
 	  
     else
       @right_partial = ""

app/controllers/admin/users_new_interface_controller.rb

@@ -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

app/helpers/application_helper.rb

@@ -271,11 +271,7 @@ module ApplicationHelper
   end
 
   def show_avatar(user)
-    if (user.avatar? rescue false)
+    image_tag(user.avatar.thumb.url)
-      image_tag(user.avatar.thumb.url)
-    else
-      image_tag "person.png"
-    end
   end
 
   # NTU link

app/models/module_app.rb

@@ -185,18 +185,18 @@ class ModuleApp
     user_ids = self.auth_approvals.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_approval_users, user_ids.uniq)
+    self.update_attribute(:auth_approval_users, user_ids.uniq)
   end
 
   def update_auth_manager_users
-    update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
+    self.update_attribute(:auth_manager_users, self.auth_manager_authorized_users.map{|user| user.id})
   end
 
   def update_auth_sub_manager_users
     user_ids = self.auth_sub_managers.inject([]) do |users, auth|
       users += auth.authorized_users.map{|user| user.id}
     end
-    update_attribute(:auth_sub_manager_users, user_ids.uniq)
+    self.update_attribute(:auth_sub_manager_users, user_ids.uniq)
   end
 
   def managers

app/uploaders/avatar_uploader.rb

@@ -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]

app/views/admin/categories/_category.html.erb

@@ -10,7 +10,7 @@
 	            <li><%= link_to show_toggle_archive_btn(category) , toggle_admin_module_app_category_path(@module_app_id, category), method: :post, remote: true, class: "archive_toggle" %></li>
 	           <% end %>
             <% if is_manager? || is_admin? %>
-							<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category', category.id) %></li>
+							<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category_authorization', category.id) %></li>
 						<% end %>
           </ul>
         </div>

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

@@ -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 %>
+                            <%= 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.name) %>
+                                <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.app_name) %>
                             <% end -%>    
                         <% end -%>
 

app/views/admin/sites/search_engine.html.erb

@@ -43,49 +43,48 @@
 
               <hr>
 
-            <% @site_valid_locales.each do |locale|%>
+               <!-- Description -->
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
+        <div class="control-group">
-              <div class="control-group">
+          <label class="control-label muted">Keywords</label>
-                <label class="control-label muted">Site Keywords</label>
+          <div class="controls">
-                <div class="controls">
+            <div class="tab-content textarea-lang">
-                  <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
-                    <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
-                     <% @site_valid_locales.each do |locale|%>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
+                <% end %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="keywords_en_0">
-                      <%= f.fields_for :keywords do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.keywords(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                    </div>
-                  </div>
-                </div>
-                <%end%>
-                <%end%>
-
-            <% @site_valid_locales.each do |locale|%>
-            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-              <div class="control-group">
-                <label class="control-label muted">Site Description</label>
-                <div class="controls">
-                  <div class="tab-content textarea-lang">
-                    <div class="btn-group" data-toggle="buttons-radio">
-                    <% @site_valid_locales.each do |locale|%>
-                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
-                      <% end %>
-                    </div>
-                    <div class="tab-pane fade active in" id="description_en_0">
-                     <%= f.fields_for :description do |f| %>
-                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.description(locale) rescue nil) %>
-                       <% end %>
-                    </div>
-                  </div>
-                </div>
               </div>
-              <%end%> 
+              <% @site_valid_locales.each_with_index do |locale, i| %>
-              <%end%> 
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :keywords do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.keywords(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label muted">Description</label>
+          <div class="controls">
+            <div class="tab-content textarea-lang">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_valid_locales.each_with_index do |locale, i| %>
+                  <a class="btn <%= ( i == 0 ) ? "active" : '' %>" href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %></a>
+                <% end %>
+              </div>
+              <% @site_valid_locales.each_with_index do |locale, i| %>
+                 <div class="tab-pane fade in <%= ( i == 0 ) ? "active" : '' %>" id="textarea_<%= locale %>_0">
+                  <%= f.fields_for :description do |f| %>
+                    <%= f.text_area locale, :class=>'resizable', :value => (@site.description(locale) rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %>
+                  <% end %>
+                 </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+
             </div>
             <!-- Form Actions -->
             <div class="form-actions">

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

@@ -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>

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

@@ -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>

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

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

app/views/desktop/index.html.erb

@@ -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 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"><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="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 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"><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="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="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 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"><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="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 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"><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="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="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>

app/views/devise/sessions/new.html.erb

@@ -1,30 +1,64 @@
-<h1 class="login-logo"><%= t(:ruling_site) %></h1>
+   <!-- Orbit Bar -->
-<div id="signin-header">
+    <!--#include virtual="include/orbit_bar.html"-->
-	<h3><%= t(:login) %></h3>
+    <section id="main-wrap">
-</div>
+      <div class="sign-in have-other-sign-in">
-<div id="container" class="sign-in">
+<!--         <p class="alert alert-error in fade">You need to sign in.</p>
-	<%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'user_new form-horizontal'} do |f| %>
+ -->    
-		<div class="content">
+        <% flash.each do |key, msg| %>
-			 <% flash.each do |key, msg| %>
+		    <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
-		    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
+		<% end %>
-		  <% end %>
+
-			<p class="alert hide">You need to sign in or sign up before continuing.</p>
+ 		<div class="form">
-			<div class="main">
+          <h3 class="login-logo">Log In to Orbit</h3>
-				<div class="control-group clear">
+          <div>
-					<%= f.label :user_id ,t("users.user_id")%>
+            <input name="utf8" type="hidden" value="" />
-					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 330px;" %>
+            <input name="authenticity_token" type="hidden" value="" />
-					<span class="help-inline">Please correct the error</span>
+          </div>
-				</div>
+<!--           <div class="other-sign-in">
-				<div class="control-group clear">
+            <a class="btn btn-primary" type="submit">Other Sign In</a>
-					<%= f.label :password,t("password") %>
+            <p>or</p>
-					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
+          </div> -->
-					<span class="help-inline">Please correct the error</span>
+          <div class="form-block">
-					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
+            <div class="form-list clearfix">
-				</div>
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
-			</div>
+               <%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'content'} do |f| %>
-		</div>
+
-		<div class="form-actions clear">
+                <div class="control-group clear">
-			<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary pull-right' %>
+                  <label for="user_email">
-		</div>
+                    <i class="icon-user"></i>
-	<% end %>
+                  </label>
-</div>
+                 	<%= f.text_field :user_id, :placeholder => t("users.user_id"), :id=>"user_email" %>
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icon-lock"></i>
+                  </label>
+                  <%= f.password_field :password, :placeholder => t(:dots), :id=>"user_password" %>
+                </div>
+                  <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+              </form>
+
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+                <div class="control-group clear">
+                  <label for="user_email">
+                    <i class="icon-user"></i>
+                  </label>
+                  <input type="text" id="user_id" name="user[id]" placeholder="帳號" />
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icons-mail"></i>
+                  </label>
+                  <input type="text" id="user_email" name="user[email]" placeholder="電子郵件" />
+                </div>
+              </form>
+            </div>
+          </div>
+         <!--  <div class="register">
+            <button class="btn btn-inverse" type="submit">Register</button>
+          </div> -->
+        <% end %>
+
+        </div>
+      </div>
+    </section>

app/views/layouts/_side_bar.html.erb

@@ -3,5 +3,4 @@
     <%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge'), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
   </h2>
 	<%= render ((local_assigns.has_key? :side_bar_content) ? side_bar_content : 'layouts/side_bar_content') %>
-  <div class="sub-nav-arrow"></div>
 </nav>

app/views/layouts/_side_bar_content.html.erb

@@ -6,6 +6,7 @@
 	    <% end %>
 	  </ul>
 	</div>
+	<div class="sub-nav-arrow"></div>
 </div>
 
 <div class="sub-nav-block-list">

app/views/layouts/devise.html.erb

@@ -6,15 +6,23 @@
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
-	<%= stylesheet_link_tag "devise" %>
+  <%= render 'layouts/meta' %>
-	<%= javascript_include_tag "devise" %>
+  <%= render 'layouts/google_font' %>
-	<%= csrf_meta_tag %>
+  <%= stylesheet_link_tag "basic/global" %>
+  <%= stylesheet_link_tag "basic" %>
+
+  <%= render 'layouts/ie_html5_fix' %>
+  <%= javascript_include_tag "basic" %>
+  <%= yield :page_specific_css %>
+  <%= yield :page_specific_javascript %>
+
+  <style>
+
+  </style>
+  <%= csrf_meta_tag %>
 </head>
 <body>
 	<%= render 'layouts/orbit_bar' %>
 	<%= yield %>
-	<div id="sign-footer">
-      <p>Rulingcom</p>
-  </div>
 </body>
 </html>

lib/orbit_app/module/side_bar.rb

@@ -112,7 +112,7 @@ module OrbitApp
             current_priority = @context_links.count
             if @approvable_with_link
               context_link 'approval_setting',
-                            :link_path => "admin_authorizations_path(get_module_app.key, 'approval')",
+                            :link_path => "admin_authorizations_path(get_module_app.key, 'category_approval')",
                             :priority => current_priority + 1,
                             :available_for => [:manager]
             end

lib/orbit_app/plugin/registration.rb

@@ -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

lib/orbit_tag/taggable.rb

@@ -46,7 +46,7 @@ module OrbitTag
 
       def tags=(tag_ids)
         tag_ids = [tag_ids].flatten
-        tag_ids.delete('')
+        tag_ids.delete_if{|e| e.match(/^[0-1]$|^$/)}
         ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
         tag_ids.each do |tag_id|
           unless ids.include? tag_id

vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb

@@ -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")

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb

@@ -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 %>

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb

@@ -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)
+				  @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
+				  @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)
+				@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
+				@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 %>

vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb

@@ -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_tag :div,
-        content(publication, view) + \
+        :class => "inner" do
-        edit_or_delete(publication)
+          marker(publication.id) + \
+          content(publication, view) + \
+          edit_or_delete(publication)
       end
+    end
   end
 
   def marker id

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

@@ -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>

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

@@ -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>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+   <ul class="s_form" isotope="true">
-        <div class="s_form">
+        <li class="s_grid_row" >
-          <ul>
             <% @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){

vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb

@@ -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" >
+    <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" >
-      <% @writing_books.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @writing_books.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_book/init.rb

@@ -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'
 
 
 

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

@@ -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>

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

@@ -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>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb

@@ -29,14 +29,13 @@
     </div>
   </div>
   <div class="viewport"> -->
-    <div class="overview" content-layout="column" base-width="420">
+    <div class="overview" content-layout="simple" base-width="420">
-      <div column="true">
+       <ul class="s_form" isotope="true">
-        <div class="s_form">
+            <li class="s_grid_row" >
-          <ul>
             <% @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> -->

vendor/built_in_modules/personal_conference/init.rb

@@ -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'
 
 
 

vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb

@@ -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

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+        <ul class="s_form" isotope="true">
-      <div class="s_form">
-        <ul>
           <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>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb

@@ -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" >
+    <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" >
-      <% @diplomas.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @diplomas.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_diploma/init.rb

@@ -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'
 
 
 

vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb

@@ -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

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

@@ -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>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+       <ul class="s_form" isotope="true">
-        <div class="s_form">
+        <li class="s_grid_row">
-          <ul>
              <% @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>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb

@@ -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" >
+    <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" >
-      <% @experiences.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @experiences.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_experience/init.rb

@@ -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'
 
 
 

vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb

@@ -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

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

@@ -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>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+    <ul class="s_form" isotope="true">
-        <div class="s_form">
+            <li class="s_grid_row" >
-          <ul>
-           <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>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb

@@ -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" >
+    <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" >
-      <% @honors.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @honors.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_honor/init.rb

@@ -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'
 
 
 

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

@@ -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",

vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml

@@ -1,6 +1,6 @@
 zh_tw:
   module_name:
-    personal_journal: 期刊著作
+    personal_journal: 期刊論文
   personal_journal:
     paper_title : "論文名稱"
     journal_title : "期刊名稱"

vendor/built_in_modules/personal_journal/init.rb

@@ -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'
 
 
 

vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb

@@ -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

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+  <ul class="s_form" isotope="true">
-        <div class="s_form">
+      <li class="s_grid_row">
-          <ul>
             <% @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"%>
+                <%= 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>
+       
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
           <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){

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb

@@ -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" >
+    <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" >
-      <% @labs.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @labs.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_lab/init.rb

@@ -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

vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb

@@ -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

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

@@ -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>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+ <ul class="s_form" isotope="true">
-        <div class="s_form">
+    <li class="s_grid_row">
-          <ul>
           <% @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"%>
+                <%= 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>
+       
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
           <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){

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb

@@ -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" >
+    <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" >
-      <% @patents.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @patents.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_patent/init.rb

@@ -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'
 
 
 

vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb

@@ -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

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

@@ -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>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+     <ul class="s_form" isotope="true">
-        <div class="s_form">
+        <li class="s_grid_row">
-          <ul>
             <% @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){

vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb

@@ -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" >
+    <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" >
-      <% @projects.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @projects.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

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, :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'
 
 
 

vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb

@@ -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

vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb

@@ -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 class="overview" content-layout="simple" base-width="420">
-    <div column="true">
+   <ul class="s_form" isotope="true">
-        <div class="s_form">
+        <li class="s_grid_row">
-          <ul>
             <% @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){

vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb

@@ -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" >
+    <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" >
-      <% @researches.each do |w| %>
+      <ul isotope="true">
-        <%= publication_record w, @view_by%>
+        <% @researches.each do |w| %>
-      <% end %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>

vendor/built_in_modules/personal_research/init.rb

@@ -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'
     
 
 

vendor/built_in_modules/survey/app/assets/javascripts/survey.js

@@ -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();
+				if( $( this ).data( 'question' ) == "old" ){
-				$( this ).find( '.should_destroy' ).val(1);
+					$(this).hide().removeAttr('data-question');
-				checkQuestionsLength();
+					$( this ).find( '.should_destroy' ).val(1);
-				$('.questions .attributes').each(function(index, el) {
+					l--;
-					$( this ).find( "input.sequence" ).val( index );
+					checkQuestionsLength();
-					$( this ).find( "h4 span:eq(0)" ).text( index + 1 );
+					$('.questions .attributes[data-question]').each(function(index, el) {
-					$( this ).attr( "data-index", index );
+						$( 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();
 	});

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb

@@ -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'}">