Skip to content

Commit

Permalink
Some layout fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas von Deyen committed Oct 27, 2011
1 parent 0260d4e commit 0104304
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 23 deletions.
32 changes: 16 additions & 16 deletions app/views/admin/pages/configure.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<table id="page_names">
<tr>
<td class="<%= @page.layoutpage ? 'label' : '' %>"><%= _("page_type") %>: </td>
<td>
<td class="input">
<%= @page.layout_display_name %>
</td>
</tr>
<%- unless @page.layoutpage -%>
<tr>
<td><%= _("page_status") %>: </td>
<td>
<td class="label"><%= _("page_status") %>: </td>
<td class="input">
<%= f.check_box :public -%>
<%= f.label :public, _('page_public') %><br/>
<%= f.check_box :visible -%>
Expand All @@ -26,39 +26,39 @@
<%- end -%>
<%- unless @page.layoutpage -%>
<tr>
<td colspan="2"><strong><%= _("names") %></strong></td>
<tdcolspan="2"><strong><%= _("names") %></strong></td>
</tr>
<%- end -%>
<tr>
<td><%= f.label( "name", _("name")) %>: </td>
<td><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
<td class="label"><%= f.label( "name", _("name")) %>: </td>
<td class="input"><%= f.text_field( "name", :size => 31, :class => "thin_border long") %></td>
</tr>
<%- unless @page.layoutpage -%>
<tr>
<td><%= f.label( "urlname", _("url_name")) %>: </td>
<td><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
<td class="label"><%= f.label( "urlname", _("url_name")) %>: </td>
<td class="input"><%= f.text_field "urlname", :size => 31, :class => "thin_border long" %></td>
</tr>
<tr>
<td><%= f.label( "title", _("page_title")) %>: </td>
<td><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
<td class="label"><%= f.label( "title", _("page_title")) %>: </td>
<td class="input"><%= f.text_field "title", :size => 31, :class => "thin_border long" %></td>
</tr>
<tr>
<td colspan="2"><strong><%= _("meta_data") %></strong></td>
</tr>
<tr>
<td><%= _("search_engines") %>: </td>
<td>
<td class="label"><%= _("search_engines") %>: </td>
<td class="input">
<%= f.check_box "robot_index" %><%= f.label( "robot_index", _("robot_index")) %><br />
<%= f.check_box "robot_follow" %><%= f.label( "robot_follow", _("robot_follow")) %>
</td>
</tr>
<tr>
<td><%= f.label( "meta_description", _("meta_description")) %>:&nbsp;</td>
<td><%= f.text_area "meta_description", :class => "thin_border long" %></td>
<td class="label"><%= f.label( "meta_description", _("meta_description")) %>:&nbsp;</td>
<td class="input"><%= f.text_area "meta_description", :class => "thin_border long" %></td>
</tr>
<tr>
<td><%= f.label( "meta_keywords", _("meta_keywords")) %>*:&nbsp;</td>
<td>
<td class="label"><%= f.label( "meta_keywords", _("meta_keywords")) %>*:&nbsp;</td>
<td class="input">
<%= f.text_area "meta_keywords", :class => "thin_border long" %><br/>
<span style="font-size:10px">*<%= _('pages.update.comma_seperated') %></span>
</td>
Expand Down
16 changes: 9 additions & 7 deletions assets/stylesheets/alchemy.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -1807,6 +1806,7 @@ input#search_input_field {
-moz-border-radius: 12px;
border-radius: 12px;
padding: 3px 24px 2px;
height: 25px;
}

input.button,
Expand Down Expand Up @@ -1906,7 +1906,7 @@ a.button.disabled:active {
}

label {
line-height: 23px;
line-height: normal;
}

a.button {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 0104304

Please sign in to comment.