From 648ecc1475f7b35b3222828dadc81770c9e8d680 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 1 Oct 2013 14:29:39 +0800
Subject: [PATCH] isotope fixed for all plugins for list and form.

---
 .../desktop/desktop-component.scss            |  8 +++-
 .../desktop/personal_books_helper.rb          |  9 ++--
 .../desktop/personal_books/_form.html.erb     | 41 ++++++----------
 .../desktop/personal_books/index.html.erb     | 10 ++--
 .../desktop/conference_pages/_form.html.erb   | 47 ++++++------------
 .../desktop/personal_diplomas_helper.rb       |  3 ++
 .../desktop/personal_diplomas/_form.html.erb  | 33 +++++--------
 .../desktop/personal_diplomas/index.html.erb  | 10 ++--
 .../desktop/personal_experiences_helper.rb    |  3 ++
 .../personal_experiences/_form.html.erb       | 29 ++++-------
 .../personal_experiences/index.html.erb       | 10 ++--
 .../desktop/personal_honors_helper.rb         |  3 ++
 .../desktop/personal_honors/_form.html.erb    | 20 +++-----
 .../desktop/personal_honors/index.html.erb    | 10 ++--
 .../desktop/journal_pages/_form.html.erb      |  2 +-
 .../desktop/personal_labs_helper.rb           |  3 ++
 .../desktop/personal_labs/_form.html.erb      | 41 +++++-----------
 .../desktop/personal_labs/index.html.erb      | 10 ++--
 .../desktop/personal_patents_helper.rb        |  3 ++
 .../desktop/personal_patents/_form.html.erb   | 32 ++++---------
 .../desktop/personal_patents/index.html.erb   | 10 ++--
 .../desktop/personal_projects_helper.rb       |  3 ++
 .../desktop/personal_projects/_form.html.erb  | 48 ++++++-------------
 .../desktop/personal_projects/index.html.erb  | 10 ++--
 .../desktop/personal_researchs_helper.rb      |  3 ++
 .../desktop/personal_researchs/_form.html.erb | 26 ++++------
 .../desktop/personal_researchs/index.html.erb | 10 ++--
 27 files changed, 185 insertions(+), 252 deletions(-)

diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss
index e41c424c8..9065061a1 100644
--- a/app/assets/stylesheets/desktop/desktop-component.scss
+++ b/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
diff --git a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
index 3c4b5fcb0..8ea06188a 100644
--- a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
+++ b/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(publication, view) + \
-        edit_or_delete(publication)
+       content_tag :div,
+        :class => "inner" do
+          marker(publication.id) + \
+          content(publication, view) + \
+          edit_or_delete(publication)
       end
+    end
   end
 
   def marker id
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb
index 8ff320d8f..7ce24beb9 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+   <ul class="s_form" isotope="true">
+        <li class="s_grid_row" >
             <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>  >
+         
+           <div class="form_fix" <%= style %> <%= data %>>
             <%= f.fields_for :paper_title_translations do |f| %>
               <%= f.text_area locale,
                 class: "s_grid_12 s_grid s_grid_h_3",
@@ -36,8 +36,7 @@
                 placeholder: t("personal_book.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
                 value: (@personal_book.paper_title_translations[locale.to_s] rescue nil) %>
             <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %> >
+         
                <%= f.fields_for :book_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -45,8 +44,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@personal_book.book_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %> >
+             
                <%= f.fields_for :extracted_chapters_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -54,8 +52,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@personal_book.extracted_chapters_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %> >
+         
                <%= f.fields_for :publishers_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -63,8 +60,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@personal_book.publishers_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+              </div>
             <% end %>
+          </li>
             <li class="s_grid_row">
               <%= label_tag("", t("personal_book.book_paper_type"), class: "s_grid_4 s_grid") %>
               <%= f.select :book_paper_type_id, BookPaperType.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@@ -107,12 +105,7 @@
               <%= label_tag("", t("personal_book.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
             </li>
             
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+        
             <li class="s_grid_row">
               <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_book.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
             </li>
@@ -127,14 +120,9 @@
                  <%= label_tag("", t("personal_book.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%>
              </li>
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_book.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
             </li>
-          </ul>
-        </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+        
           <li class="s_grid_row">
           <table class="s_table">
             <thead>
@@ -165,8 +153,7 @@
           </table>
           </li>
         </ul>
-      </div>
-    </div>
+
 </div>
 <script>
   var get_html = function(old_id,new_id){
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
index 9096e25f6..2dee7a948 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
+++ b/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" >
-      <% @writing_books.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="books_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @writing_books.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index c125a8d25..6f514484f 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+    <div class="overview" content-layout="simple" base-width="420">
+       <ul class="s_form" isotope="true">
+            <li class="s_grid_row" >
             <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
             <%= f.fields_for :paper_title_translations do |f| %>
               <%= f.text_area locale,
                 class: "s_grid_12 s_grid_h_2 s_grid",
@@ -44,8 +43,6 @@
                 placeholder: t("personal_conference.paper_title")+ "("+I18nVariable.from_locale(locale)+")",
                 value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %>
             <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
             <%= f.fields_for :conference_title_translations do |f| %>
               <%= f.text_field locale,
                 size: "20",
@@ -53,8 +50,9 @@
                 class: "s_grid_12 s_grid",
                 value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %>
             <% end %>
-            </li>
+          </div>
             <% end %>
+          </li>
             <li class="s_grid_row">
             <div>
               <%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %>
@@ -99,11 +97,7 @@
             <li class="s_grid_row">
             <%= label_tag("", t("personal_conference.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%>
             </li>
-          </ul>
-        </div>
-        <div column="true">
-          <div class="s_form">
-            <ul>
+         
               <li class="s_grid_row">
               <%= f.text_area :author_tokens,
                 class: "s_grid_12 s_grid",
@@ -155,12 +149,7 @@
           </li>
 
           <li class="s_grid_row"><input class="s_grid s_grid_12" type="text" placeholder=<%= t("personal_conference.tags") %>></li>
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
             <li class="s_grid_row">
             <table class="s_table">
               <thead>
@@ -190,22 +179,16 @@
               </tbody>
             </table>
             </li>
-          </ul>
-        </div>
-        <div column="true">
-          <ul class="s_form">
-              <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid"%>
-            </li>
-          </ul>
-        </div>
-        <div column="true">
-          <ul class="s_form">
+        
             <li class="s_grid_row">
-              <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid"%>
+            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
+            </li>
+        
+            <li class="s_grid_row">
+              <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid s_grid_h_full"%>
             </li>
           </ul>
-        </div>
+
       </div>
   <!-- </div>
 </div> -->
diff --git a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
index b0e3eedff..d7703237c 100644
--- a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb
index 690a9922e..804e52a79 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/_form.html.erb
+++ b/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 column="true">
-      <div class="s_form">
-        <ul>
+<div class="overview" content-layout="simple" base-width="420">
+        <ul class="s_form" isotope="true">
           <li class="s_grid_row">
                 <%= label_tag("", t("personal_diploma.start_date"), class: "s_grid_4 s_grid") %>
                 <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -35,10 +33,11 @@
                 <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
                 <%= f.date_select :end_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
             </li>
+            <li class="s_grid_row">
              <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+               <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :school_name_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -46,8 +45,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@diploma.school_name_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+           
                <%= f.fields_for :country_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -55,8 +53,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@diploma.country_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+   
                <%= f.fields_for :department_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -64,8 +61,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@diploma.department_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+    
                <%= f.fields_for :degree_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -73,8 +69,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@diploma.degree_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
             <li class="s_grid_row">
               <%= label_tag("", t("personal_diploma.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
             </li>
@@ -85,16 +82,10 @@
                 <%= f.label :language, t("personal_diploma.language"), :class => "s_grid s_grid_4" %>
                 <%= f.select :language, Diploma::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
-          </ul>
-        </div>
-      </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_diploma.note"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
             </li>
         </ul>
-       </div>
-    </div>
+
 </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb
index b35f9457a..94778bff4 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb
+++ b/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" >
-      <% @diplomas.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="diploma_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @diplomas.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb b/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb
index b5d91e7e9..cc5f9f5a2 100644
--- a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb
index 9b6d8b9d9..fab775e92 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+       <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
              <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :organizationt_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -36,8 +35,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@experience.organizationt_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
                <%= f.fields_for :department_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -45,8 +43,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@experience.department_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+         
                <%= f.fields_for :job_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -54,8 +51,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@experience.job_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
             <li class="s_grid_row">
               <%= label_tag("", t("personal_experience.experience_category"), class: "s_grid_4 s_grid") %>
               <%= f.select :experience_category_id, ExperienceCategory.all.collect {|t| [ t.title, t.id ]}, {:class => "s_grid s_grid_8"} %>
@@ -80,16 +78,9 @@
                 <%= f.label :language, t("personal_experience.language"), :class => "s_grid s_grid_4" %>
                 <%= f.select :language, Experience::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
-             </ul>
-          </div>
-       </div>
-        <div column="true">
-          <div class="s_form">
-            <ul>
+       
               <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_experience.note"), value: @experience.note , class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
             </li>
         </ul>
-      </div>
-    </div>
 </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb
index bbcaf1f30..1418b2c9a 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb
+++ b/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" >
-      <% @experiences.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="experience_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @experiences.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
index bee7a81b0..b349dd8d3 100644
--- a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb
index 7f64080f6..c3eca3f22 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
-           <li class="s_grid_row">
+<div class="overview" content-layout="simple" base-width="420">
+    <ul class="s_form" isotope="true">
+            <li class="s_grid_row" >
               <%= label_tag("", t("personal_honor.award_name"), class: "s_grid_4 s_grid") %><%= f.text_field :award_name, size: "20", class: "s_grid_8 s_grid"%>
             </li>
             <li class="s_grid_row">
@@ -49,16 +47,10 @@
                 <%= f.label :language, t("personal_honor.language"), :class => "s_grid s_grid_4" %>
                 <%= f.select :language, Honor::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
-        </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+   
               <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_honor.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
             </li>
         </ul>
-      </div>
-    </div>
+  
 </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb
index 5c4175dfd..17e7929af 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb
+++ b/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" >
-      <% @honors.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="honor_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @honors.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
index 3c2f5e7de..443bc5560 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
+++ b/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",
diff --git a/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb b/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb
index 7269457f5..05d5d66d0 100644
--- a/vendor/built_in_modules/personal_lab/app/helpers/panel/personal_lab/desktop/personal_labs_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb
index b0c80a6e5..5059b6643 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+  <ul class="s_form" isotope="true">
+      <li class="s_grid_row">
             <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-           <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :lab_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -36,8 +35,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@lab.lab_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+           
                <%= f.fields_for :location_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -45,8 +43,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@lab.location_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
                <%= f.fields_for :participating_professor_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -54,8 +51,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@lab.participating_professor_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+         
                <%= f.fields_for :participating_student_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -63,8 +59,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@lab.participating_student_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
             <li class="s_grid_row">
               <%= label_tag("", t("personal_lab.extension_no"), class: "s_grid_4 s_grid") %><%= f.text_field :extension_no, size: "20", class: "s_grid_8 s_grid"%>
             </li>
@@ -81,12 +78,7 @@
             <li class="s_grid_row">
               <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_lab.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
             </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+          
             <li class="s_grid_row">
               <%= label_tag("", t("personal_lab.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
             </li>
@@ -95,14 +87,8 @@
                 <%= f.select :language, Lab::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
-            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_lab.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
+       
           <li class="s_grid_row">
           <table class="s_table">
             <thead>
@@ -133,8 +119,7 @@
           </table>
           </li>
         </ul>
-      </div>
-    </div>
+      
 </div>
 <script>
   var get_html = function(old_id,new_id){
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb
index 46037cd5c..971fb6292 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb
+++ b/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" >
-      <% @labs.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="lab_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @labs.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb b/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb
index b77c60c03..8a6781d4a 100644
--- a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb
index ee4fea48a..94f011427 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+ <ul class="s_form" isotope="true">
+    <li class="s_grid_row">
           <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-           <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :patent_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -36,8 +35,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@patent.patent_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
               <li class="s_grid_row">
               <%= label_tag("", t("personal_patent.patent_no"), class: "s_grid_4 s_grid") %><%= f.text_field :patent_no, size: "20", class: "s_grid_8 s_grid"%>
             </li>
@@ -67,21 +67,10 @@
                 <%= f.label :language, t("personal_patent.language"), :class => "s_grid s_grid_4" %>
                 <%= f.select :language, WritingPatent::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+         
               <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5"%>
-            </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_patent.note"), class: "s_grid_12 s_grid s_grid_h_5 s_grid_h_full"%>
+       
           <li class="s_grid_row">
           <table class="s_table">
             <thead>
@@ -112,8 +101,7 @@
           </table>
           </li>
         </ul>
-      </div>
-    </div>
+   
 </div>
 <script>
   var get_html = function(old_id,new_id){
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb
index 6c6b01141..6d0d811ad 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb
+++ b/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" >
-      <% @patents.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="patent_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @patents.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb b/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb
index 9dce677e2..b7ae89f48 100644
--- a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb
index 432f7e6f9..3c77d551e 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+     <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
             <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+             <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :project_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -36,8 +35,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@project.project_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+        
                <%= f.fields_for :job_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -45,8 +43,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@project.job_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+           
                <%= f.fields_for :participator_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -54,8 +51,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@project.participator_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-            <li class="s_grid_row" <%= style %> <%= data %>>
+          
                <%= f.fields_for :unit_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -63,8 +59,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@project.unit_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
              <li class="s_grid_row">
                 <%= label_tag("", t("personal_project.start_date"), class: "s_grid_4 s_grid") %>
                 <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -86,12 +83,7 @@
              <li class="s_grid_row">
               <%= label_tag("", t("personal_project.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
             </li>
-          </ul>
-      </div>
-    </div>
-      <div column="true">
-        <div class="s_form">
-          <ul>
+       
              <li class="s_grid_row">
               <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_project.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
             </li>
@@ -100,23 +92,13 @@
                 <%= f.select :language, Project::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>             
               <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_project.note"), class: "s_grid_12 s_grid s_grid_h_7 s_grid_h_full"%>
             </li>
-        </ul>
-      </div>
-    </div>
-    <div column="true">
-        <div class="s_form">
-          <ul>
+   
              <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%>
+            <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_project.abstract"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
             </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+     
           <li class="s_grid_row">
           <table class="s_table">
             <thead>
@@ -147,8 +129,6 @@
           </table>
           </li>
         </ul>
-      </div>
-    </div>
 </div>
 <script>
   var get_html = function(old_id,new_id){
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb
index 216ad74e7..9e3c670f1 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb
+++ b/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" >
-      <% @projects.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="project_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @projects.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb b/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb
index 0f86c564d..27169d890 100644
--- a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb
+++ b/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
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb
index 0f9cefbf7..aa159af8d 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/_form.html.erb
+++ b/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 column="true">
-        <div class="s_form">
-          <ul>
+<div class="overview" content-layout="simple" base-width="420">
+   <ul class="s_form" isotope="true">
+        <li class="s_grid_row">
             <% @site_valid_locales.each_with_index do |locale, i| %>
               <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %>
               <% data = "data-language=" + locale  %>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+               <div class="form_fix" <%= style %> <%= data %>>
                <%= f.fields_for :research_title_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -36,8 +35,7 @@
                     class: "s_grid_12 s_grid",
                     value: (@research.research_title_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
-             <li class="s_grid_row" <%= style %> <%= data %>>
+           
                <%= f.fields_for :extracted_chapters_translations do |f| %>
                   <%= f.text_field locale,
                     size: "20",
@@ -45,8 +43,9 @@
                     class: "s_grid_12 s_grid",
                     value: (@research.extracted_chapters_translations[locale.to_s] rescue nil) %>
                 <% end %>
-            </li>
+            </div>
             <% end %>
+          </li>
              <li class="s_grid_row">
                 <%= label_tag("", t("personal_research.publication_date"), class: "s_grid_4 s_grid") %>
                 <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %>
@@ -63,14 +62,9 @@
                 <%= f.select :language, Research::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
              </li>
              <li class="s_grid_row">
-                <%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3"%>
+                <%= f.text_area :note, size: "20x3", placeholder: t("personal_research.note"), class: "s_grid_12 s_grid s_grid_h_3 s_grid_h_full"%>
             </li>
-        </ul>
-      </div>
-    </div>
-     <div column="true">
-      <div class="s_form">
-        <ul>
+   
           <li class="s_grid_row">
           <table class="s_table">
             <thead>
@@ -101,8 +95,6 @@
           </table>
           </li>
         </ul>
-      </div>
-    </div>
 </div>
 <script>
   var get_html = function(old_id,new_id){
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb
index 3da2fcb64..a3a70332d 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb
+++ b/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" >
-      <% @researches.each do |w| %>
-        <%= publication_record w, @view_by%>
-      <% end %>
+    <div class="overview" page-name="research_list" content-layout="simple" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
+      <ul isotope="true">
+        <% @researches.each do |w| %>
+          <%= publication_record w, @view_by%>
+        <% end %>
+      </ul>
     </div>
\ No newline at end of file