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 = {
this.limit=limit;
this.offset=limit;
this.initLoadMore();
$('.loading').show();
},
getOld:
......
......@@ -13,18 +13,16 @@ class WikisController < ApplicationController
@wiki = @project.wikis.where(:slug => params[:id]).order("created_at").last
end
unless @wiki
return render_404 unless can?(current_user, :write_wiki, @project)
end
@note = @project.notes.new(:noteable => @wiki)
respond_to do |format|
if @wiki
format.html
else
if @wiki
render 'show'
else
if can?(current_user, :write_wiki, @project)
@wiki = @project.wikis.new(:slug => params[:id])
format.html { render "edit" }
render 'edit'
else
render 'empty'
end
end
end
......
......@@ -38,7 +38,6 @@
%li Push to non-protected branches
%li Remove non-protected branches
%li Add tags
%li Create new merge request
%li Write a wiki
.ui-box.span3
......@@ -55,7 +54,6 @@
%li Push to non-protected branches
%li Remove non-protected branches
%li Add tags
%li Create new merge request
%li Write a wiki
%li Add new team members
%li Push to protected branches
......
......@@ -14,6 +14,6 @@
ago
- else
.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 @@
- @wiki.errors.full_messages.each do |msg|
%li= msg
.alert-message.block-message.warning
%p
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
%br
To add link to new page you can just type
%code [Link Title](page-slug)
.clearfix
= f.label :title
.input= f.text_field :title, :class => :xxlarge
= f.hidden_field :slug
.clearfix
= f.label :content
.input= f.text_area :content, :class => :xxlarge
.main_box
.top_box_content
= f.label :title
.input= f.text_field :title, :class => 'span8'
= f.hidden_field :slug
.middle_box_content
.input
%span.cgray
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
To add link to new page you can just type
%code [Link Title](page-slug)
.bottom_box_content
= f.label :content
.input= f.text_area :content, :class => 'span8'
.actions
= f.submit 'Save', :class => "primary btn"
= link_to "Cancel", project_wiki_path(@project, :index), :class => "btn"
%h3 Editing page
%h3.page_title Editing page
%hr
= 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