Commit b1c7003cd5a3e3eeed1ca8f8907061be640e0cfe
1 parent
87d02e5c
Exists in
master
and in
28 other branches
adjust the display of new content type options.
Showing
2 changed files
with
17 additions
and
7 deletions
Show diff stats
app/views/cms/select_article_type.rhtml
| 1 | +<div class="select-article-type"> | ||
| 2 | + | ||
| 1 | <h2> <%= _('Choose the type of content:') %> </h2> | 3 | <h2> <%= _('Choose the type of content:') %> </h2> |
| 2 | 4 | ||
| 3 | -<ul id="article_types"> | 5 | +<ul class="article-types"> |
| 4 | <% for type in @article_types %> | 6 | <% for type in @article_types %> |
| 5 | <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %> | 7 | <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %> |
| 6 | <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %> | 8 | <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %> |
| @@ -14,3 +16,5 @@ | @@ -14,3 +16,5 @@ | ||
| 14 | <br style="clear:both" /> | 16 | <br style="clear:both" /> |
| 15 | 17 | ||
| 16 | <%= colorbox_close_button(_('Cancel')) %> | 18 | <%= colorbox_close_button(_('Cancel')) %> |
| 19 | + | ||
| 20 | +</div> |
public/stylesheets/application.css
| @@ -2998,11 +2998,17 @@ table.cms-articles a.icon, table.cms-articles a.icon-parent-folder { | @@ -2998,11 +2998,17 @@ table.cms-articles a.icon, table.cms-articles a.icon-parent-folder { | ||
| 2998 | table.cms-articles .icon:hover { | 2998 | table.cms-articles .icon:hover { |
| 2999 | background-color: transparent; | 2999 | background-color: transparent; |
| 3000 | } | 3000 | } |
| 3001 | -#article_types { | 3001 | + |
| 3002 | +.select-article-type { | ||
| 3003 | + padding: 5px 20px; | ||
| 3004 | + width: 455px; | ||
| 3005 | +} | ||
| 3006 | + | ||
| 3007 | +.article-types { | ||
| 3002 | padding-left: 5px; | 3008 | padding-left: 5px; |
| 3003 | margin-top: 20px; | 3009 | margin-top: 20px; |
| 3004 | } | 3010 | } |
| 3005 | -#article_types li { | 3011 | +.article-types li { |
| 3006 | list-style: none; | 3012 | list-style: none; |
| 3007 | float: left; | 3013 | float: left; |
| 3008 | width: 180px; | 3014 | width: 180px; |
| @@ -3016,18 +3022,18 @@ table.cms-articles .icon:hover { | @@ -3016,18 +3022,18 @@ table.cms-articles .icon:hover { | ||
| 3016 | -moz-border-radius: 5px; | 3022 | -moz-border-radius: 5px; |
| 3017 | -webkit-border-radius: 5px; | 3023 | -webkit-border-radius: 5px; |
| 3018 | } | 3024 | } |
| 3019 | -#article_types .description { | 3025 | +.article-types .description { |
| 3020 | color: #888a85; | 3026 | color: #888a85; |
| 3021 | font-size: smaller; | 3027 | font-size: smaller; |
| 3022 | } | 3028 | } |
| 3023 | -#article_types .icon-newrss-feed, #content .icon-rss-feed { | 3029 | +.article-types .icon-newrss-feed, #content .icon-rss-feed { |
| 3024 | background-image: url(../images/icons-mime/rss-feed-16.png); | 3030 | background-image: url(../images/icons-mime/rss-feed-16.png); |
| 3025 | } | 3031 | } |
| 3026 | -#article_types a { | 3032 | +.article-types a { |
| 3027 | text-decoration: none; | 3033 | text-decoration: none; |
| 3028 | color: black; | 3034 | color: black; |
| 3029 | } | 3035 | } |
| 3030 | -#article_types li.mouseover { | 3036 | +.article-types li.mouseover { |
| 3031 | background-color: #eeeeec; | 3037 | background-color: #eeeeec; |
| 3032 | } | 3038 | } |
| 3033 | .controller-cms #article-subitems-hide.hide-button { | 3039 | .controller-cms #article-subitems-hide.hide-button { |