[refs# 193] Move some gollum style to docs/gollum. Add new styles to edit and new pages

app/views/wiki/edit.html.haml

@@ -1,33 +1,55 @@
 = render :partial => 'gollum_includes'
-= render :partial => 'project_short'
+=# render :partial => 'project_short'
+= render :partial => 'projects/submenu'
 
-%a{ :name => "wiki"}
-.block
-  = render :partial => 'navigation'
-
-  .content
-    #wiki-wrapper.inner
-      #head
-        %h1.title
+%h3.wiki
   = t("layout.wiki.editing_page")
   %strong= @page.name
-
-        %ul.actions
-          - if can? :read, @project
-            %li.minibutton
+- if can? :read, @project
+  .r
     = link_to t("layout.wiki.view_page"), view_path(@project, escaped_name),
-                        :class => 'action-view-page'
-            %li.minibutton
+              :class => 'action-view-page button width100'
+  .r
     = link_to t("layout.wiki.page_history"), history_project_wiki_path(@project, escaped_name),
-                        :class => 'aciton-view-history'
+              :class => 'aciton-view-history button width100'
 
-      #wiki-content
+%br
+%br
+%br
+
+#wiki-content
   = render :partial => "editor"
 
+//%a{ :name => "wiki"}
+//.block
+//  = render :partial => 'navigation'
+//
+//  .content
+//    #wiki-wrapper.inner
+//      #head
+//        %h1.title
+//          = t("layout.wiki.editing_page")
+//          %strong= @page.name
+//
+//        %ul.actions
+//          - if can? :read, @project
+//            %li.minibutton
+//              = link_to t("layout.wiki.view_page"), view_path(@project, escaped_name),
+//                        :class => 'action-view-page'
+//            %li.minibutton
+//              = link_to t("layout.wiki.page_history"), history_project_wiki_path(@project, escaped_name),
+//                        :class => 'aciton-view-history'
+//
+//      #wiki-content
+//        = render :partial => "editor"
+
 :javascript
   jQuery(document).ready(function() {
     $.GollumEditor();
   });
 
+:css
+  #gollum-editor { width: 100%; }
+
 - content_for :sidebar do
-  - render :partial => 'projects/sidebar'
+  - render :partial => 'sidebar'

app/views/wiki/new.html.haml

@@ -1,24 +1,36 @@
 = render :partial => 'gollum_includes'
-= render :partial => 'project_short'
+=# render :partial => 'project_short'
+= render :partial => 'projects/submenu'
 
-%a{ :name => "wiki"}
-.block
-  = render :partial => 'navigation'
-
-  .content
-    #wiki-wrapper.inner
-      #head
-        %h1.title
+%h3.wiki
   = t("layout.wiki.create_page")
   %strong= @name
+%br
 
-      #wiki-content
+#wiki-content
   = render :partial => "editor"
 
+//%a{ :name => "wiki"}
+//.block
+//  = render :partial => 'navigation'
+//
+//  .content
+//    #wiki-wrapper.inner
+//      #head
+//        %h1.title
+//          = t("layout.wiki.create_page")
+//          %strong= @name
+//
+//      #wiki-content
+//        = render :partial => "editor"
+
 :javascript
   jQuery(document).ready(function() {
     $.GollumEditor({ NewFile: true });
   });
 
+:css
+  #gollum-editor { width: 100%; }
+
 - content_for :sidebar do
-  - render :partial => 'projects/sidebar'
+  - render :partial => 'sidebar'

app/views/wiki/show.html.haml

@@ -15,9 +15,15 @@
     - if can? :write, @project
       = link_to t("layout.wiki.new_page"), '#', :'data-url' => project_wiki_index_path(@project),
                 :id => 'minibutton-new-page', :class => 'button width100'
+%br
+%br
+%br
 .both
 =# render :partial => 'searchbar'
 = render :partial => "page"
 
 - content_for :sidebar do
   - render :partial => 'sidebar'
+
+:css
+  #wiki-content .wrap { width: 100% }

vendor/assets/stylesheets/vendor.scss

@@ -6,5 +6,5 @@
 @import "gollum/gollum";
 @import "gollum/dialog";
 @import "gollum/ie7";
-@import "gollum/template";
+//@import "gollum/template";
 @import "gollum/editor";