Commit c27105f8 authored by randx's avatar randx

Fixed dashboard loader, fixed 404 for reporter on empty wiki page.

Styled Wiki edit page
parent 14c97237
...@@ -8,7 +8,6 @@ var Pager = { ...@@ -8,7 +8,6 @@ var Pager = {
this.limit=limit; this.limit=limit;
this.offset=limit; this.offset=limit;
this.initLoadMore(); this.initLoadMore();
$('.loading').show();
}, },
getOld: getOld:
......
...@@ -13,18 +13,16 @@ class WikisController < ApplicationController ...@@ -13,18 +13,16 @@ class WikisController < ApplicationController
@wiki = @project.wikis.where(:slug => params[:id]).order("created_at").last @wiki = @project.wikis.where(:slug => params[:id]).order("created_at").last
end end
unless @wiki
return render_404 unless can?(current_user, :write_wiki, @project)
end
@note = @project.notes.new(:noteable => @wiki) @note = @project.notes.new(:noteable => @wiki)
respond_to do |format| if @wiki
if @wiki render 'show'
format.html else
else if can?(current_user, :write_wiki, @project)
@wiki = @project.wikis.new(:slug => params[:id]) @wiki = @project.wikis.new(:slug => params[:id])
format.html { render "edit" } render 'edit'
else
render 'empty'
end end
end end
end end
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
%li Push to non-protected branches %li Push to non-protected branches
%li Remove non-protected branches %li Remove non-protected branches
%li Add tags %li Add tags
%li Create new merge request
%li Write a wiki %li Write a wiki
.ui-box.span3 .ui-box.span3
...@@ -55,7 +54,6 @@ ...@@ -55,7 +54,6 @@
%li Push to non-protected branches %li Push to non-protected branches
%li Remove non-protected branches %li Remove non-protected branches
%li Add tags %li Add tags
%li Create new merge request
%li Write a wiki %li Write a wiki
%li Add new team members %li Add new team members
%li Push to protected branches %li Push to protected branches
......
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
ago ago
- else - else
.alert-message.block-message .alert-message.block-message
%p All files attached to project wall, issues etc will be displayed here %span All files attached to project wall, issues etc will be displayed here
...@@ -6,19 +6,21 @@ ...@@ -6,19 +6,21 @@
- @wiki.errors.full_messages.each do |msg| - @wiki.errors.full_messages.each do |msg|
%li= msg %li= msg
.alert-message.block-message.warning .main_box
%p .top_box_content
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. = f.label :title
%br .input= f.text_field :title, :class => 'span8'
To add link to new page you can just type = f.hidden_field :slug
%code [Link Title](page-slug) .middle_box_content
.clearfix .input
= f.label :title %span.cgray
.input= f.text_field :title, :class => :xxlarge Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
= f.hidden_field :slug To add link to new page you can just type
.clearfix %code [Link Title](page-slug)
= f.label :content
.input= f.text_area :content, :class => :xxlarge .bottom_box_content
= f.label :content
.input= f.text_area :content, :class => 'span8'
.actions .actions
= f.submit 'Save', :class => "primary btn" = f.submit 'Save', :class => "primary btn"
= link_to "Cancel", project_wiki_path(@project, :index), :class => "btn" = link_to "Cancel", project_wiki_path(@project, :index), :class => "btn"
%h3 Editing page %h3.page_title Editing page
%hr %hr
= render 'form' = render 'form'
%h3.page_title Empty page
%hr
.alert-message.block-message.warning
%span You are not allowed to create wiki pages
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment