Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #193] changes in wiki

This commit is contained in:
Alexander Machehin 2012-03-23 21:36:47 +06:00
parent 7f31246463
commit 86bd036418
5 changed files with 98 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/assets/stylesheets/design/main.scss
View File

@ -2365,3 +2365,44 @@ table.tablesorter.width565 {
article h3 a {
font-size: 14px;
}
/*Wiki*/
div#wiki-content div.wrap {
width: 100%;
text-align: left;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
background: #FFF;
margin-top: 20px;
}
div#wiki-content div#wiki-body {
float: left;
width: 410px;
margin: 0px 0px 20px;
}
div#wiki-content div#wiki-rightbar {
float: right;
width: 170px;
}
div#wiki-content div#wiki-footer {
clear: both;
margin: 20px 0px;
}
div#wiki-content div#wiki-rightbar, div#wiki-content div#wiki-footer {
background-color: #f7f7f7;
border: 1px solid #DDDDDD;
border-radius: 3px;
line-height: 1.5em;
padding: 10px 20px;
}
div#gollum-footer {
color: #727272;
}

1
app/views/wiki/_page.html.haml
View File

@ -7,6 +7,7 @@
- if has_footer?
#wiki-footer{:class => "gollum-#{footer_format}-content"}
#footer-content= raw footer_content
.both
#gollum-footer
%p#last-edit
= t("wiki.last_edited_by")

18
app/views/wiki/edit.html.haml
View File

@ -1,18 +1,14 @@
= render 'gollum_includes'
/ = render 'project_short'
= render 'projects/submenu'
%h3.wiki
= t("wiki.editing_page")
%strong= @page.name
.left
%h3
= t("wiki.editing_page")
%strong= @page.name
- if can? :read, @project
.r= link_to t("wiki.view_page"), view_path(@project, escaped_name), :class => 'action-view-page button width100'
.r= link_to t("wiki.page_history"), history_project_wiki_path(@project, escaped_name), :class => 'aciton-view-history button width100'
%br
%br
%br
.r= link_to t("wiki.view_page"), view_path(@project, escaped_name), :class => 'action-view-page button'
.r= link_to t("wiki.page_history"), history_project_wiki_path(@project, escaped_name), :class => 'aciton-view-history button'
.both
#wiki-content= render "editor"
:javascript

18
app/views/wiki/show.html.haml
View File

@ -1,23 +1,19 @@
/ = render 'gollum_includes'
/ = render 'project_short'
= render 'projects/submenu'
%h3.wiki
= @page.name
= "(#{t("wiki.preview")})" if action_name == 'preview'
.left
%h3
= @page.name
= "(#{t("wiki.preview")})" if action_name == 'preview'
- unless action_name == 'preview'
.r
= link_to t("wiki.page_history"), history_project_wiki_path(@project, escaped_name), :class => 'button width100'
= link_to t("wiki.page_history"), history_project_wiki_path(@project, escaped_name), :class => 'button'
.r
- if @editable
= link_to t("wiki.edit_page"), edit_project_wiki_path(@project, escaped_name), :class => "button width100"
= link_to t("wiki.edit_page"), edit_project_wiki_path(@project, escaped_name), :class => 'button'
.r
- if can? :write, @project
= link_to t("wiki.new_page"), '#', :'data-url' => project_wiki_index_path(@project), :id => 'minibutton-new-page', :class => 'button width100'
%br
%br
%br
= link_to t("wiki.new_page"), '#', :'data-url' => project_wiki_index_path(@project), :id => 'minibutton-new-page', :class => 'button'
.both
/ = render 'searchbar'
= render "page"

42
doc/design/styles/main.css
View File

@ -2368,4 +2368,46 @@ table.tablesorter.width565 {
article h3 a {
font-size: 14px;
}
/*Wiki*/
div#wiki-content div.wrap {
width: 100%;
text-align: left;
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
background: #FFF;
margin-top: 20px;
}
div#wiki-content div#wiki-body {
float: left;
width: 410px;
margin: 0px 0px 20px;
}
div#wiki-content div#wiki-rightbar {
float: right;
width: 170px;
}
div#wiki-content div#wiki-footer {
clear: both;
margin: 20px 0px;
}
div#wiki-content div#wiki-rightbar, div#wiki-content div#wiki-footer {
background-color: #f7f7f7;
border: 1px solid #DDDDDD;
border-radius: 3px;
line-height: 1.5em;
padding: 10px 20px;
}
div#gollum-footer {
color: #727272;
}