Merge remote-tracking branch 'Nethemba/form_ux_impro'

Progressbar · Sep 5, 2012 · a1f6b2e · a1f6b2e
2 parents 8eeb044 + f33d667
commit a1f6b2e
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 44 deletions.
diff --git a/app/views/refinery/blog/admin/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb
@@ -11,13 +11,6 @@
     <%= f.text_field :title, :class => 'larger widest' -%>
   </div>
 
-  <div class="field">
-    <p>
-      <%= f.check_box :draft %>
-      <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %>
-    </p>
-  </div>
-
   <div class='field'>
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>
@@ -47,18 +40,13 @@
     </div>
   </div>
 
+  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
+
   <div class='field'>
     <%= f.label :tag_list, t('refinery.blog.shared.tags.title') -%>
     <%= f.text_field :tag_list, :class => 'larger' -%>
   </div>
 
-  <div id='more_options_field'>
-    <p>
-      <%= link_to t('.advanced_options'), "#",
-                  :id => 'toggle_advanced_options',
-                  :title => t('.toggle_advanced_options') %>
-    </p>
-  </div>
   <div id='more_options' style="display:none;">
     <div class="hemisquare">
       <h3><%= t('title', :scope => 'refinery.blog.admin.submenu.categories') %></h3>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -35,9 +35,7 @@ bg:
             approve: Одобряване на този коментар
         posts:
           form:
-            advanced_options: Разширени настройки
             toggle_advanced_options: Натиснете, за да достъпите настройките за етикета "meta" и менюто
-            save_as_draft: Запис като чернова
             published_at: Дата на публикуване
             custom_url: Уеб адрес по избор
             custom_url_help: Вместо от заглавието, генерирайте уеб адреса за тази публикация чрез този текст.

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -35,9 +35,7 @@ cs:
             approve: Schváliť komentář
         posts:
           form:
-            advanced_options: Pokročilé nastavení
             toggle_advanced_options: Klikni pro přístup k nastavením meta tagů a menu 
-            save_as_draft: Uložit jako koncept 
             published_at: Datum publikování
           index:
             no_items_yet: 'Nejsou žádné články na blogu. Klikni na "%{create}" pro přidání prvního.'

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -35,9 +35,7 @@ de:
             approve: Kommentar genehmigen
         posts:
           form:
-            advanced_options: Erweiterte Optionen
             toggle_advanced_options: 'Klicken, um auf Meta-Tag-Einstellungen und Menüoptionen zuzugreifen'
-            save_as_draft: Als Entwurf speichern
             published_at: Veröffentlichungsdatum
             custom_url: Eigene Url
             custom_url_help: Url von disem Text generieren und nicht vom Titel.

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -35,9 +35,7 @@ en:
             approve: Approve this comment
         posts:
           form:
-            advanced_options: Advanced Options
             toggle_advanced_options: Click to access meta tag settings and menu options
-            save_as_draft: Save as Draft
             published_at: Publish Date
             custom_url: Custom Url
             custom_url_help: Generate the url for the blog post from this text instead of the title.

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -35,9 +35,7 @@ es:
             approve: Aprovar este comentario
         posts:
           form:
-            advanced_options: Opciones avanzadas
             toggle_advanced_options: Click para acceder a las opciones de menú y etiquetas
-            save_as_draft: Guardar Borrador
             published_at: Fecha de publicación
           index:
             no_items_yet: 'Aún no hay entradas en el Blog. Haz click en "%{create}" para añadir el primero'

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -35,9 +35,7 @@ fr:
             approve: Approuver ce commentaire
         posts:
           form:
-            advanced_options: Options avancées
             toggle_advanced_options: Cliquez ici pour accéder aux paramêtres des meta-tags et au menu des options
-            save_as_draft: Enregistrer comme Brouillon
             published_at: Date de publication
           index:
             no_items_yet: 'Il n''y a aucun article pour l''instant. Cliquez sur "%{create}" pour ajouter votre premier article.'

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -35,9 +35,7 @@ it:
             approve: Approva questo commento
         posts:
           form:
-            advanced_options: Opzioni Avanzate
             toggle_advanced_options: Clicca per accedere alle impostationi dei meta tag e del menu
-            save_as_draft: Salva come Bozza
             published_at: Data di Pubblicazione
             custom_url: Url personalizzato
             custom_url_help: Puoi scegliere un url specifico per questo articolo. Lasciando questo campo vuoto verrà utilizzato il titolo.

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -35,9 +35,7 @@ ja:
             approve: このコメントを承認する
         posts:
           form:
-            advanced_options: 詳細オプション
             toggle_advanced_options: メタタグの設定メニューをアクセスするにはここをクリックして下さい
-            save_as_draft: 下書きとして保存
             published_at: 公開時刻
             custom_url: カスタムURL
             custom_url_help: 投稿のURLをここのテキストとして登録する。

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -35,9 +35,7 @@ nl:
             approve: Keur deze reactie goed
         posts:
           form:
-            advanced_options: Geavanceerde eigenschappen
             toggle_advanced_options: Klik voor toegang tot meta tag instellingen en menu opties
-            save_as_draft: Sla op als concept
             published_at: Publicatiedatum 
           index:
             no_items_yet: 'Er zijn momenteel geen blogposts. Klik op "%{create}" om uw eerste blogpost toe te voegen.'

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
@@ -35,9 +35,7 @@ pl:
             approve: Zaakceptuj ten komentarz
         posts:
           form:
-            advanced_options: Opcje zaawansowane
             toggle_advanced_options: 'Kliknij, aby zarządzać meta-ustawieniami'
-            save_as_draft: Zapisz jako szkic
             published_at: Data publikacji
           index:
             no_items_yet: 'Na blogu nie ma jeszcze żadnych wpisów. Kliknij "%{create}" aby dodać pierwszy post.'

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -35,9 +35,7 @@ pt-BR:
             approve: Aprovar este comentário
         posts:
           form:
-            advanced_options: Opções avançadas
             toggle_advanced_options: Clique aqui para acessar as configurações de meta tag e menu
-            save_as_draft: Salvar como rascunho
             published_at: Data de publicação
           index:
             no_items_yet: 'Ainda não há Posts no Blog. Clique em "%{create}" para adicionar o primeiro post.'

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -35,9 +35,7 @@ ru:
             approve: Принять этот комментарий
         posts:
           form:
-            advanced_options: Дополнительные настройки
             toggle_advanced_options: 'Нажмите, чтобы получить доступ к настройкам мета-тегов и меню'
-            save_as_draft: Сохранить как черновик
             published_at: Дата публикации
           index:
             no_items_yet: 'Записи в блоге отстутствуют. Нажмите "%{create}", чтобы добавить первую запись.'

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
@@ -35,9 +35,7 @@ sk:
             approve: Schváliť komentár
         posts:
           form:
-            advanced_options: Pokročilé nastavenia
             toggle_advanced_options: Klikni pre prístup k nastaveniam meta tagov a menu
-            save_as_draft: Uložiť ako koncept
             published_at: Dátum publikovania
             custom_url: Vlastná url
             custom_url_help: Generovať url pre blog článok z tohto textu namiesto názvu blog článku.

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
@@ -35,9 +35,7 @@ sv:
             approve: Godkänn denna kommentar
         posts:
           form:
-            advanced_options: Avancerat
             toggle_advanced_options: Klicka för att ställa in metataggar och menyinställningar
-            save_as_draft: Spara som utkast
             published_at: Publiceringsdatum
             custom_url: Anpassad URL
             custom_url_help: Skapa URL för bloggposten med denna text istället för ttieln

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
@@ -35,9 +35,7 @@ zh-CN:
             approve: 批准此评论
         posts:
           form:
-            advanced_options: 高级选项
             toggle_advanced_options: 点击进入标签详解设置和菜单选项
-            save_as_draft: 保存为草稿
             published_at: 发布日期
           index:
             no_items_yet: '目前尚未发博。 点击 "%{create}" 添加您的第一篇博文。'