diff --git a/app/views/cms/text_html_new.rhtml b/app/views/cms/text_html_new.rhtml index 84ec412..b9723bc 100644 --- a/app/views/cms/text_html_new.rhtml +++ b/app/views/cms/text_html_new.rhtml @@ -11,5 +11,6 @@ <%= f.text_area('body', :cols => 64) %> <%= design_display_button_submit('save', _('Save')) %> + <%= design_display_button('cancel', _('Cancel'), :action => 'view', :id => @article) %> <% end %> diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml index 9af48bc..1074021 100644 --- a/app/views/cms/view.rhtml +++ b/app/views/cms/view.rhtml @@ -48,6 +48,16 @@ <% if @article %>
+<%= _('%s did not choose an article for homepage yet.') % profile.name %> +
diff --git a/public/stylesheets/button.css b/public/stylesheets/button.css index 9988c59..11069cd 100644 --- a/public/stylesheets/button.css +++ b/public/stylesheets/button.css @@ -3,14 +3,14 @@ margin-left: 5px; background-color: transparent; background-repeat: no-repeat; - background-position: 0px; + background-position: 0 0; padding-left: 25px; padding-right: 2px; float: left; display: block; - height: 26px; + height: 24px; } diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 183c08e..3f40f19 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -201,6 +201,9 @@ div.file-manager-button a:hover { float: right; color: white; } +#article-subitems-show.show-button { + float: right; +} #article-subitems-hide.hide-button:hover { background-color: transparent; color: black; @@ -220,4 +223,5 @@ div.file-manager-button a:hover { border: 1px solid gray; padding-top: 4px; padding-bottom: 4px; + margin-bottom: 1em; } -- libgit2 0.21.2