diff --git a/app/views/admin/pages/configure.html.erb b/app/views/admin/pages/configure.html.erb index 7e8aeacb5c..655219723f 100644 --- a/app/views/admin/pages/configure.html.erb +++ b/app/views/admin/pages/configure.html.erb @@ -3,14 +3,14 @@ - <%- unless @page.layoutpage -%> - - + - + <%= _("names") %> <%- end -%> - - + + <%- unless @page.layoutpage -%> - - + + - - + + - - + - - + + - - + diff --git a/assets/stylesheets/alchemy.css b/assets/stylesheets/alchemy.css index c988432319..ac1f8f8764 100644 --- a/assets/stylesheets/alchemy.css +++ b/assets/stylesheets/alchemy.css @@ -823,8 +823,8 @@ div.tip { padding: 0px 8px; height: 21px; text-shadow: #fff 0 0px 4px; - background: #CCC; - color: #555; + background: #d6e0e6; + color: #444; -webkit-border-top-right-radius: 3px; -webkit-border-top-left-radius: 3px; -moz-border-radius: 3px 3px 0 0; @@ -853,7 +853,6 @@ div.tip { #sub_navigation div.subnavi_tab:hover { color: #333; text-decoration: none; - background-color: #d8d8d8; } #sub_navigation div.subnavi_tab.active { @@ -1807,6 +1806,7 @@ input#search_input_field { -moz-border-radius: 12px; border-radius: 12px; padding: 3px 24px 2px; + height: 25px; } input.button, @@ -1906,7 +1906,7 @@ a.button.disabled:active { } label { - line-height: 23px; + line-height: normal; } a.button { @@ -1929,8 +1929,9 @@ td.label { td.label { white-space: nowrap; - padding: 3px 4px 0 0; width: 80px; + padding: 3px 8px 0 0; + line-height: 23px; } td.label.long { @@ -3091,10 +3092,11 @@ input#user_admin { #alchemy div#overlay_toolbar div#image_assign_filter_and_image_sizing form { float: right; - width: 290px; + width: 232px; height: 25px; margin-top: 2px; padding: 0 !important; + margin-right: 0; } div#image_assign_filter_and_image_sizing form div.search_field { @@ -3344,7 +3346,7 @@ div.assign_file_file_icon img { #alchemy .ui-dialog-content td.label { padding-top: 2px; padding-bottom: 2px; - padding-right: 4px; + padding-right: 8px; height: 25px; }
<%= _("page_type") %>: + <%= @page.layout_display_name %>
<%= _("page_status") %>: + <%= _("page_status") %>: <%= f.check_box :public -%> <%= f.label :public, _('page_public') %>
<%= f.check_box :visible -%> @@ -26,39 +26,39 @@ <%- end -%> <%- unless @page.layoutpage -%>
<%= _("names") %>
<%= f.label( "name", _("name")) %>: <%= f.text_field( "name", :size => 31, :class => "thin_border long") %><%= f.label( "name", _("name")) %>: <%= f.text_field( "name", :size => 31, :class => "thin_border long") %>
<%= f.label( "urlname", _("url_name")) %>: <%= f.text_field "urlname", :size => 31, :class => "thin_border long" %><%= f.label( "urlname", _("url_name")) %>: <%= f.text_field "urlname", :size => 31, :class => "thin_border long" %>
<%= f.label( "title", _("page_title")) %>: <%= f.text_field "title", :size => 31, :class => "thin_border long" %><%= f.label( "title", _("page_title")) %>: <%= f.text_field "title", :size => 31, :class => "thin_border long" %>
<%= _("meta_data") %>
<%= _("search_engines") %>: + <%= _("search_engines") %>: <%= f.check_box "robot_index" %><%= f.label( "robot_index", _("robot_index")) %>
<%= f.check_box "robot_follow" %><%= f.label( "robot_follow", _("robot_follow")) %>
<%= f.label( "meta_description", _("meta_description")) %>: <%= f.text_area "meta_description", :class => "thin_border long" %><%= f.label( "meta_description", _("meta_description")) %>: <%= f.text_area "meta_description", :class => "thin_border long" %>
<%= f.label( "meta_keywords", _("meta_keywords")) %>*:  + <%= f.label( "meta_keywords", _("meta_keywords")) %>*:  <%= f.text_area "meta_keywords", :class => "thin_border long" %>
*<%= _('pages.update.comma_seperated') %>