Download as
Browse Code »

Commit 673c506c8bd6e65ff40f51517613f5bc97ac7dd4

Authored by Rodrigo Souto
2 parents 3d1e7050 64b41e23
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge commit 'refs/merge-requests/358' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/358
Showing 3 changed files with 11 additions and 1 deletions   Show diff stats
app/controllers/my_profile/cms_controller.rb
  Diff comments   View file @673c506
... ... @@ -205,7 +205,7 @@ class CmsController < MyProfileController
205 205 @article.destroy
206 206 session[:notice] = _("\"#{@article.name}\" was removed.")
207 207 referer = ActionController::Routing::Routes.recognize_path URI.parse(request.referer).path rescue nil
208   - if referer and referer[:controller] == 'cms'
  208 + if referer and referer[:controller] == 'cms' and referer[:action] != 'edit'
209 209 redirect_to referer
210 210 elsif @article.parent
211 211 redirect_to @article.parent.url
... ...
app/views/cms/edit.rhtml
  Diff comments   View file @673c506
... ... @@ -41,6 +41,7 @@
41 41  
42 42 <% button_bar do %>
43 43 <%= submit_button :save, _('Save') %>
  44 +
44 45 <% if @back_to %>
45 46 <%= button :cancel, _('Cancel'), @back_to %>
46 47 <% elsif @parent_id || @article.parent %>
... ... @@ -48,6 +49,11 @@
48 49 <% else %>
49 50 <%= button :cancel, _('Cancel'), :action => 'index' %>
50 51 <% end %>
  52 +
  53 + <% unless @article.new_record? %>
  54 + <%= button :delete, _('Delete'), {:controller => :cms, :action => :destroy, :id => @article},
  55 + :method => :post, :confirm => delete_article_message(@article) %>
  56 + <% end %>
51 57 <% end %>
52 58 <% end %>
53 59 </div>
... ...
public/stylesheets/application.css
  Diff comments   View file @673c506
... ... @@ -3267,6 +3267,10 @@ table.cms-articles .icon:hover {
3267 3267 max-width: 100%;
3268 3268 }
3269 3269  
  3270 +.controller-cms .button-bar .icon-delete {
  3271 + float: right;
  3272 +}
  3273 +
3270 3274 /************* external blog options *****************/
3271 3275  
3272 3276 .controller-cms #fetch-external-feed {
... ...