Update empty error messages and warn if not viewing the most recent wiki page

Riyad Preukschas
1 parent b55ed840
Showing 4 changed files with 22 additions and 5 deletions Show diff stats
app/assets/stylesheets/common.scss
app/controllers/wikis_controller.rb
app/views/wikis/empty.html.haml
app/views/wikis/show.html.haml
@@ -446,6 +446,19 @@ li.note {
   }
 }
  
+.warning_message {
+  border-left: 4px solid #ed9;
+  color: #b90;
+  padding: 10px;
+  margin-bottom: 10px;
+  background: #ffffe6;
+  padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
+}
+
 .oauth_select_holder {
   padding: 20px;
   img {
@@ -8,14 +8,13 @@ class WikisController &lt; ProjectResourceController
   end
  
   def show
+    @most_recent_wiki = @project.wikis.where(slug: params[:id]).ordered.first
     if params[:version_id]
       @wiki = @project.wikis.find(params[:version_id])
     else
-      @wiki = @project.wikis.where(slug: params[:id]).ordered.first
+      @wiki = @most_recent_wiki
     end
  
-    @note = @project.notes.new(noteable: @wiki)
-
     if @wiki
       render 'show'
     else
 %h3.page_title Empty page
 %hr
-.alert-message.block-message.warning
-  %span You are not allowed to create wiki pages
+.error_message
+  You are not allowed to create wiki pages
@@ -10,6 +10,11 @@
         %i.icon-edit
         Edit
 %br
+- if @wiki != @most_recent_wiki
+  .warning_message
+    This is an old version of this page.
+    You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
+
 .file_holder
   .file_content.wiki
     = preserve do
...	...	@@ -446,6 +446,19 @@ li.note {
446	446	}
447	447	}
448	448
	449	+.warning_message {
	450	+ border-left: 4px solid #ed9;
	451	+ color: #b90;
	452	+ padding: 10px;
	453	+ margin-bottom: 10px;
	454	+ background: #ffffe6;
	455	+ padding-left: 20px;
	456	+
	457	+ &.centered {
	458	+ text-align: center;
	459	+ }
	460	+}
	461	+
449	462	.oauth_select_holder {
450	463	padding: 20px;
451	464	img {
...	...
...	...	@@ -8,14 +8,13 @@ class WikisController < ProjectResourceController
8	8	end
9	9
10	10	def show
	11	+ @most_recent_wiki = @project.wikis.where(slug: params[:id]).ordered.first
11	12	if params[:version_id]
12	13	@wiki = @project.wikis.find(params[:version_id])
13	14	else
14		- @wiki = @project.wikis.where(slug: params[:id]).ordered.first
	15	+ @wiki = @most_recent_wiki
15	16	end
16	17
17		- @note = @project.notes.new(noteable: @wiki)
18		-
19	18	if @wiki
20	19	render 'show'
21	20	else
...	...
1	1	%h3.page_title Empty page
2	2	%hr
3		-.alert-message.block-message.warning
4		- %span You are not allowed to create wiki pages
	3	+.error_message
	4	+ You are not allowed to create wiki pages
...	...
...	...	@@ -10,6 +10,11 @@
10	10	%i.icon-edit
11	11	Edit
12	12	%br
	13	+- if @wiki != @most_recent_wiki
	14	+ .warning_message
	15	+ This is an old version of this page.
	16	+ You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
	17	+
13	18	.file_holder
14	19	.file_content.wiki
15	20	= preserve do
...	...