From caca264b50b8e19300e5a4763f041a94ace04098 Mon Sep 17 00:00:00 2001 From: Harry Bomrah 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 e41c424c..9065061a 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 3c4b5fcb..8ea06188 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 8ff320d8..7ce24beb 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 @@
-
-
-
-
    +
    +
      +
    • <% @site_valid_locales.each_with_index do |locale, i| %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% data = "data-language=" + locale %> -
    • <%= data %> > + +
      <%= 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 %> -
    • -
    • <%= 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 %> -
    • -
    • <%= 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 %> -
    • -
    • <%= 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 %> -
    • +
    <% end %> +
  • <%= 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"%>
  • -
-
-
-
-
-
    +
  • <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_book.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
  • @@ -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"%>
  • - <%= 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"%>
  • -
-
-
-
-
-
    +
  • @@ -165,8 +153,7 @@
-
-
+