@@ -48,7 +48,8 @@ module Admin::BaseHelper block = Proc.new { |locale| link_to_edit(locale, content, :cl => locale) } unless block locales = content.translated_locales.map { |locale| block.call(locale.to_s) } content_tag(:span, :class => 'content_translations') do - t(:"adva.#{content[:type].tableize}.translation_links", :locales => locales.join(', ')) + t(:"adva.#{content[:type].tableize}.translation_links", :locales => locales.join(', ')) + + "<p class=\"hint\" for=\"content_translations\">#{t(:'adva.hints.content_translations')}</p>" end end engines/adva_cms/app/helpers/admin/base_helper.rb @@ -2,6 +2,7 @@ <% f.field_set do %> <% column do %> <%= hidden_field_tag 'cl', Article.locale %> + <%= f.text_field :title, :class => 'big', :label => true %> <p id="article_excerpt_wrapper" style="<%= @article.has_excerpt? ? "" : "display:none" %>"> engines/adva_cms/app/views/admin/articles/_form.html.erb @@ -5,6 +5,7 @@ html = label_tag(:content_locale, t(:'adva.common.locale')) + %(<select id="content_locale" name="cl">#{options_for_select I18n.available_locales, Article.locale}</select>) + (@section.try(:single_article_mode) ? '' : f.text_field(:permalink, :label => true, :hint => :'adva.hints.permalink')) + + %(<p class="hint" for="content_locale">#{t(:'adva.hints.locale')}</p>) + f.text_field(:tag_list, :label => true, :hint => :'adva.hints.tags') unless @categories.empty? @@ -12,7 +13,7 @@ render(:partial => 'categories/checkboxes', :locals => { :categories => @categories, :content => @article }) end - html << f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter') + + html << f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter', :hint => :'adva.hints.filter') + f.select(:comment_age, comment_expiration_options, {}, :label => :'adva.titles.comments') + f.select(:author_id, author_options(@site.users), { :selected => author_selected(@article) }, :label => true) end engines/adva_cms/app/views/admin/articles/_options.html.erb @@ -1,3 +1,6 @@ +<p class="hint text_only"> + <%= t(:'adva.sections.hints.sections') %> +</p> <% table_for @sections, :collection_name => :sections, :class => 'sections list tree' do |t| t.column :section engines/adva_cms/app/views/admin/sections/index.html.erb @@ -143,6 +143,16 @@ en: hints: permalink: Use only ASCII characters and use dashes instead of spaces. tags: Enter one or more tags separated by a space. You may include spaces by enclosing a tag with quotes. (For example, <em>"Web Dev" Tutorials</em>). + content_translations: Click to change the translation to edit. To add another translation, use the locales option in the menu on the right. + locale: Choose what region or language your article should be formatted for. + filter: How is your content written? If you used the graphical text editor, use the default Plain HTML option. Otherwise, choose your markup languange. + meta_keywords: Enter a few words separated by commas to describe your content. Meta keywords make it easier for search engines to find your page. + meta_description: Enter a short description of this page so a search engine can tell users what they can find here. + template: Enter the location (like “Templates/*”) of the template that articles in this section should use. If you're unsure, leave this field blank. + layout: Enter the location (like “Layouts/*”) of the layout that articles in this section should use. If you're unsure, leave this field blank. + akismet: Askimet is a third-party service to filter spam. If you've signed up for the service, enter your API Key and URL and check the box to enable this service. + defensio: Defensio is a third-party service to filter spam. If you've signed up for the service, enter your API Key and URL and check the box to enable this service. + roles: Choose which areas this user can access on the site. messages: insufficient_permissions: title: Insufficient permissions @@ -212,7 +222,8 @@ en: confirm_delete: Are you sure you want to delete this site? sections: hints: - content_filter: When articles are posted, they use this as the default setting. + content_filter: How should your articles be read? The default option is Plain HTML. + sections: Listed below are all the sections currently on your site. Whichever section is on top is the default homepage. Use the reorder option to change your homepage and the way your sections appear in navigation. titles: page_settings: Page specific settings blog_settings: Blog specific settings @@ -452,7 +463,7 @@ en: comments: Comments approved: Approved hints: - comments_filter: When comments are posted, they use this markup. + comments_filter: Which markup should be used to read comments? The default is Plain HTML. confirm_delete: Are you sure you want to delete this comment? info: under_review: This comment is currently under review. @@ -923,7 +934,7 @@ en: tracking_source: Source hints: tracking_code: Use your Google Analytics Tracking Code (UA-xxxxxxx-x) to enable Google Analytics support. Leaving this blank will deactivate Google Analytics support. - no_tracking_code: In order to use Google Analytics to track your newsletters, you need to set up your tracking code first. You can do this in the {{settings}}. + no_tracking_code: If you'd like to use Google Analytics to track your issue, enable Google Analytics by entering your tracking code on the main Settings page. glossary: Not sure what to use here? Check {{link}} for further information. glossary_name: the Google Analytics help spam: engines/adva_cms/config/locales/adva_cms/en.yml @@ -12,23 +12,25 @@ $(document).ready(function() { $('#toggle_draft').click(Form.toggleDraft); if($(".hint").size() > 0) { - $(".hint").each(function() { - var label = $("label[for=" + this.getAttribute('for') + "]"); - - if(label) { - $(this).appendTo(label); - } - }) - - $(".hint").addClass("enabled"); - - $('.hint.enabled').tooltip({ - id: 'helptip', - delay: 0, - track: true, - bodyHandler: function() { - return $(this).html(); - } - }); + $(".hint").each(function() { + if(!$(this).hasClass('text_only')) { + var label = $("label[for=" + this.getAttribute('for') + "]"); + + if(label) { + $(this).appendTo(label); + } + + $(this).addClass("enabled"); + } + }) + + $('.hint.enabled').tooltip({ + id: 'helptip', + delay: 0, + track: true, + bodyHandler: function() { + return $(this).html(); + } + }); } }); engines/adva_cms/public/javascripts/adva_cms/jquery.common.js @@ -2,7 +2,7 @@ content_for :sidebar do f.tabs do f.tab :options do - f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter') + f.select(:filter, filter_options, {}, :class => 'columnsFilter', :label => :'adva.titles.filter', :hint => :'adva.hints.filter') end f.tab :assets do assets = { :latest => @site.assets.recent, :attached => [], :bucket => @site.assets.bucket(session[:bucket]) } engines/adva_newsletter/app/views/admin/issues/_options.html.erb @@ -1,3 +1,5 @@ +<p class="hint text_only"><%= t(:'adva.newsletters.hints.newsletter')%></p> + <% table_for @newsletters do |t| t.column :name, :issues, :subscribers, :actions engines/adva_newsletter/app/views/admin/newsletters/index.html.erb @@ -27,6 +27,8 @@ en: create_now: Create one now edit: Edit delete: Delete + hints: + newsletter: Use the Newsletters feature to send e-mail messages to users on your site. Manage multiple newsletters for multiple groups of subscribers. Create issues to deliver e-mail messages to subscribers. issues: confirm_delete: Are you sure you want to delete this issue? links: @@ -34,6 +36,8 @@ en: new: New edit: Edit delete: Delete + hints: + tracking: If you'd like to use Google Analytics to track your issue, enable Google Analytics by entering your tracking code on the main Settings page. subscriptions: confirm_delete: Are you sure you want to delete this subscription? links: engines/adva_newsletter/config/locales/en.yml @@ -2,10 +2,11 @@ <% f.field_set :spam_settings do %> <% column do %> <h4><%= t(:'adva.titles.spam_filters') %></h4> - <span class="hint"><%= t(:'adva.spam.hints.filters') %></span> + <span class="hint text_only"><%= t(:'adva.spam.hints.filters') %></span> <% SpamEngine::Filter.names.each do |name| %> <h3><%= name %></h3> + <p class="hint text_only"><%= t(:"adva.hints.#{name.downcase}")%></a> <p> <%= check_box_tag "site[spam_options][filters][]", name, site.spam_filter_active?(name), :class => "site_spam_options_filter", :id => "site_spam_options_filter_#{name.downcase}" unless name == 'Default' %> <%= label :site, "spam_options_filter_#{name.downcase}", (name != 'Default' ? "Enable #{name} filter" : 'Settings'), :class => 'inline' %> engines/adva_spam/app/views/admin/sites/_spam_settings.html.erb @@ -13,7 +13,8 @@ <% if has_permission?('manage', 'roles') %> <h4><%= t(:'adva.titles.roles') %></h4> - + <p class="hint text_only"><%= t(:'adva.hints.roles') %></p> + <% f.field_set do %> <% if current_user.has_role?(:superuser) %> <p> engines/adva_user/app/views/admin/users/_form.html.erb @@ -2,11 +2,11 @@ <% f.field_set :templates do %> <% column do %> - <%= f.text_field :template, :label => true %> + <%= f.text_field :template, :label => true, :hint => :'adva.hints.template' %> <% end %> <% column do %> - <%= f.text_field :layout, :label => true %> + <%= f.text_field :layout, :label => true, :hint => :'adva.hints.layout' %> <% end %> <% end %> plugins/adva_context_templates/app/views/admin/sections/_template_settings.html.erb @@ -28,10 +28,9 @@ <% end %> <% else %> <% f.tab :tracking do %> - <p class="hint"> + <p class="hint text_only "> <%= t(:'adva.tracking.hints.no_tracking_code', - :settings => link_to(t(:'adva.resources.settings'), - edit_admin_site_path(@site))) %> + :settings => link_to(t(:'adva.resources.settings'))) %> </p> <% end %> <% end %> plugins/adva_google_analytics/app/views/admin/issues/_tracking.html.erb @@ -1,5 +1,5 @@ -<%= f.text_field :meta_keywords, :label => true, :value => meta_value_from(@article.meta_keywords, @site.meta_keywords) %> -<%= f.text_area :meta_description, :class => 'small', :label => true, :value => meta_value_from(@article.meta_description, @site.meta_description) %> +<%= f.text_field :meta_keywords, :label => true, :value => meta_value_from(@article.meta_keywords, @site.meta_keywords), :hint => :'adva.hints.meta_keywords' %> +<%= f.text_area :meta_description, :class => 'small', :label => true, :value => meta_value_from(@article.meta_description, @site.meta_description), :hint => :'adva.hints.meta_description' %> <%= f.text_field :meta_author, :label => true, :value => meta_value_from(@article.meta_author, @site.meta_author, current_user.name) %> <%= f.text_field :meta_copyright, :label => true, :value => meta_value_from(@article.meta_copyright, @site.meta_copyright, "#{Date.today.year}, #{current_user.name}") %> <%= f.text_field :meta_geourl, :label => true, :value => meta_value_from(@article.meta_geourl, @site.meta_geourl), plugins/adva_meta_tags/app/views/admin/articles/_meta_tags.html.erb @@ -1,8 +1,8 @@ <h2><%= t(:'adva.titles.meta_tags') %></h2> <% f.field_set :meta_tags do %> <% column do %> - <%= f.text_field :meta_keywords, :label => true %> - <%= f.text_area :meta_description, :class => 'small', :label => true %> + <%= f.text_field :meta_keywords, :label => true, :hint => :'adva.hints.meta_keywords' %> + <%= f.text_area :meta_description, :class => 'small', :label => true, :hint => :'adva.hints.meta_description' %> <% end %> <% column do %> plugins/adva_meta_tags/app/views/admin/sites/_meta_tags.html.erb a002dc9793317453d2efa41c7fa277b39d063ab0 Marko Seppae marko.seppa@gmail.com http://github.com/svenfuchs/adva_cms/commit/aa1eecbb7fb5525c863632679f7a158b76355879 aa1eecbb7fb5525c863632679f7a158b76355879 2009-07-08T02:39:12-07:00 2009-07-08T02:39:12-07:00 bunch of help hints f6d4fd942fab49626858113dd1b4a6d00a742b44 Marko Seppae marko.seppa@gmail.com