From 4685952bd687609ccaaa5b9610b52ecd9cca2df2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Sun, 13 May 2012 20:13:26 +0800 Subject: [PATCH] Changes in page_edit --- app/assets/images/editicon.png | Bin 0 -> 2935 bytes app/assets/stylesheets/sidebar.css.erb | 1 + app/assets/stylesheets/style.css.erb | 28 +++++- app/views/admin/pages/_edit.html.erb | 19 ++-- app/views/admin/pages/_form.html.erb | 128 ++++++++++++++++--------- app/views/admin/pages/_new.html.erb | 22 ++--- lib/parsers/parser_common.rb | 2 +- 7 files changed, 132 insertions(+), 68 deletions(-) create mode 100644 app/assets/images/editicon.png diff --git a/app/assets/images/editicon.png b/app/assets/images/editicon.png new file mode 100644 index 0000000000000000000000000000000000000000..cef3e600041b8e110bc9050067807b87953ad38d GIT binary patch literal 2935 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 d{Bti2ZBWFK~`XBEIp0WS{ literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/sidebar.css.erb b/app/assets/stylesheets/sidebar.css.erb index 15922cc0..1e4b4010 100644 --- a/app/assets/stylesheets/sidebar.css.erb +++ b/app/assets/stylesheets/sidebar.css.erb @@ -11,6 +11,7 @@ } .nav-list ol li { padding: 5px 0; + list-style: none; } .nav-list ol li a { font-size: 13px; diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index c4b2e93c..ba1c3066 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -110,10 +110,8 @@ padding:6px; } #orbit-bar .nav > li.search { - background-image: none; overflow: hidden; width: 28px; - margin-bottom: 0; position: relative; } #orbit-bar .nav > li > a.orbit-bar-home { @@ -686,6 +684,32 @@ z-index: 2 !important; } +#back_main .editable { + position: relative; +} +#back_main .editable:after { + content: ''; + clear: both; + display: block; + visibility: hidden; + height: 0; +} + +#back_main .edit_link a { + position: absolute; + z-index: 10; + width: 100%; + height: 100%; + top: 0; + left: 0; + text-indent: -9999px; + background: url(<%= asset_path 'editicon.png' %>) no-repeat center center rgba(255,255,255,.8); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); +} + + [class^="icons-"] { display: inline-block; width: 16px; diff --git a/app/views/admin/pages/_edit.html.erb b/app/views/admin/pages/_edit.html.erb index 61ff8046..d81a533d 100644 --- a/app/views/admin/pages/_edit.html.erb +++ b/app/views/admin/pages/_edit.html.erb @@ -1,10 +1,11 @@ <%= flash_messages %> - -

<%= t('admin.editing_page') %>

- -<%= form_for @item, :url => admin_page_path(@item) do |f| %> - <%= render :partial => "form", :locals => { :f => f } %> -

- <%= f.submit t('update') %> <%= link_back %> -

-<% end %> \ No newline at end of file +
+

<%= t('admin.editing_page') %>

+ <%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form-horizontal edit_page' } do |f| %> + <%= render :partial => "form", :locals => { :f => f } %> +
+ <%= f.submit t('update'), :class => 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
+ <% end %> +
\ No newline at end of file diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb index 7aae7c00..36e6e008 100644 --- a/app/views/admin/pages/_form.html.erb +++ b/app/views/admin/pages/_form.html.erb @@ -1,52 +1,92 @@ <%= f.error_messages %> <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %> -

-<%= f.label :name, t('admin.name') %> -<%= f.text_field :name, :class => 'text' %> -

+
+ <%= f.label :name, t('admin.name'), :class => 'control-label' %> +
+ <%= f.text_field :name, :class => 'text input-xlarge' %> + +
+
<%= f.fields_for :i18n_variable, (@item.new_record? ? @item.build_i18n_variable : @item.i18n_variable) do |f| %> - <% @site_valid_locales.each do |locale| %> -

- <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %> - <%= f.text_field locale %> -

- <% end %> + <% @site_valid_locales.each do |locale| %> +
+ <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
+ <%= f.text_field locale, :class => 'text input-xlarge' %> + +
+
+ <% end %> <% end %> -

- <%= t('admin.design_name') %> - <%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %> -

-

- <%= t('admin.theme') %> - <%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %> -

-

- <%= t('admin.module_app') %> - <%= render :partial => "app_selector", :locals => { :f => f } %> - <%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> - <%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> -

-

- <%= f.label :is_published, "#{t('admin.is_published')} ?" %> - <%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No -

-

- <%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:" %> - <% @site_valid_locales.each do |valid_locale| %> - <%= check_box_tag 'page[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %> - <%= I18nVariable.from_locale(valid_locale) %> - <% end %> - <%= hidden_field_tag 'page[menu_enabled_for][]', '' %> -

-

- <%= f.label :enabled_for, "#{t('admin.enabled_for')}:" %> - <% @site_valid_locales.each do |valid_locale| %> - <%= check_box_tag 'page[enabled_for][]', valid_locale, (@item.enabled_for.nil? ? true : @item.enabled_for.include?(valid_locale)) %> - <%= I18nVariable.from_locale(valid_locale) %> - <% end %> - <%= hidden_field_tag 'page[enabled_for][]', '' %> -

+
+ <%= f.label :name, t('admin.design_name'), :class => 'control-label' %> +
+ <%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %> + +
+
+
+ <%= f.label :name, t('admin.theme'), :class => 'control-label' %> +
+ <%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %> + +
+
+
+ <%= f.label :name, t('admin.module_app'), :class => 'control-label' %> +
+ <%= render :partial => "app_selector", :locals => { :f => f } %> + + <%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> + + + <%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> + + +
+
+
+ <%= f.label :is_published, "#{t('admin.is_published')} ?", :class => 'control-label' %> +
+ + + +
+
+
+ <%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:", :class => 'control-label' %> +
+ <% @site_valid_locales.each do |valid_locale| %> + + <% end %> + <%= hidden_field_tag 'page[menu_enabled_for][]', '' %> + +
+
+ +
+ <%= f.label :enabled_for, "#{t('admin.enabled_for')}:", :class => 'control-label' %> +
+ <% @site_valid_locales.each do |valid_locale| %> + + <% end %> + <%= hidden_field_tag 'page[enabled_for][]', '' %> + +
+
diff --git a/app/views/admin/pages/_new.html.erb b/app/views/admin/pages/_new.html.erb index a2991bec..d3190e0e 100644 --- a/app/views/admin/pages/_new.html.erb +++ b/app/views/admin/pages/_new.html.erb @@ -1,13 +1,11 @@ -

<%= t('admin.new_page') %>

- <%= flash_messages %> - -<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form' } do |f| %> - - <%= render :partial => "form", :locals => { :f => f } %> - -

- <%= f.submit t('create') %> <%= link_back %> -

- -<% end %> \ No newline at end of file +
+

<%= t('admin.new_page') %>

+ <%= form_for @item, :url => admin_page_path, :html => { :class => 'form-horizontal edit_page' } do |f| %> + <%= render :partial => "form", :locals => { :f => f } %> +
+ <%= f.submit t('update'), :class => 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
+ <% end %> +
\ No newline at end of file diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 180914b3..f9dd868a 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -175,6 +175,7 @@ module ParserCommon ret << "
" if part ret << "' end case part.kind when 'text' @@ -189,7 +190,6 @@ module ParserCommon else '' end if part - ret << '
' if edit end scope = "<#{content.name}" content.attributes.each_pair do |key, value|