diff --git a/README.md b/README.md
index ef94cdc..e38b668 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ redmine_private_wiki
```
redmine_wiki_lists
|
- +-- /app/views/issues/_list.html.erb
+ +-- /app/views/issues/_embedded_list.html.erb
|
+-- /config/locales/en.yml
|
diff --git a/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb b/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb
index 6ca99d7..8b9ff96 100755
--- a/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb
+++ b/plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb
@@ -27,7 +27,7 @@
<% if !page.private? %>
<%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>
<% elsif User.current.allowed_to?(:view_privates_wiki, @project) %>
- <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <%= l(:private_flag) %>
+ <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <%= l(:private_flag) %>
<% end %>
<% end %>
@@ -35,7 +35,7 @@
<%= format_date(date) %>
<% @pages_by_date[date].each do |page| %>
- - <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <%= l(:private_flag) %>
+ - <%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <%= l(:private_flag) %>
<% end %>
<% end %>
diff --git a/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css b/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css
index cbf7dc7..19bd483 100755
--- a/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css
+++ b/plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css
@@ -6,6 +6,9 @@
border-radius: 2px;
cursor: default;
}
+.private_wiki_flag {
+ margin-left: .44em;
+}
.icon-setprivate{
background-image: url(../images/hide.png);
diff --git a/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb b/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb
index fe08883..e8166b4 100755
--- a/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb
+++ b/plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb
@@ -20,7 +20,7 @@ module WikiPatches
content << ""
content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil},
:title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
- content << ' ' + l(:private_flag) + ''
+ content << ' ' + l(:private_flag) + ''
content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
content << "\n"
end
diff --git a/public/themes/circlepro/stylesheets/application.css b/public/themes/circlepro/stylesheets/application.css
index 36f71bf..af2c49b 100644
--- a/public/themes/circlepro/stylesheets/application.css
+++ b/public/themes/circlepro/stylesheets/application.css
@@ -4,33 +4,33 @@
/*
* CirclePro Theme:
*
- * 1. GENERAL
- * 2. FONT ICONS
- * 3. HEADER
- * 4. TOP-MENU
- * 5. SOCIAL-MENU
- * 6. MAIN-MENU
- * 7. SIDEBAR
- * 8. FOOTER
- + 9. NEWS
- * 10. WIKI
+ * 1. GENERAL
+ * 2. FONT ICONS
+ * 3. HEADER
+ * 4. TOP-MENU
+ * 5. SOCIAL-MENU
+ * 6. MAIN-MENU
+ * 7. SIDEBAR
+ * 8. FOOTER
+ * 9. NEWS
+ * 10. WIKI
* 11. DOCUMENTS
- * 12. FLASH MESSAGES
- * 13. LOGIN FORM
- * 14. TAGS
- * 15. CONTEXT-MENU
- * 16. TIP
- * 17. jQuery UI
- * 18. BUTTONS
- * 19. FORMS COMMON
- * 20. FORMS SPECIFIC
- * 21. TABS
- * 22. TABLES
- * 23. OBJECTS
+ * 12. FLASH MESSAGES
+ * 13. LOGIN FORM
+ * 14. TAGS
+ * 15. CONTEXT-MENU
+ * 16. TIP
+ * 17. jQuery UI
+ * 18. BUTTONS
+ * 19. FORMS COMMON
+ * 20. FORMS SPECIFIC
+ * 21. TABS
+ * 22. TABLES
+ * 23. OBJECTS
* 24. GLOSSARY
- * 25. RESPONSIVE
- * 26. SELECT2
- * 27. PRINTING
+ * 25. RESPONSIVE
+ * 26. SELECT2
+ * 27. PRINTING
*
* Based on Circle Theme by Kirill Bezrukov.
*/
@@ -588,6 +588,9 @@ ul.social-menu .social-link-mail:hover a {
#sidebar div#admin-menu {
margin-top: 10px;
}
+#sidebar div.wiki {
+ margin-top: 0;
+}
#sidebar div.wiki p,
#sidebar div.wiki li {
font-size: 16px;
@@ -598,6 +601,15 @@ ul.social-menu .social-link-mail:hover a {
margin-top: 0;
padding-left: 20px;
}
+#sidebar div.wiki ul.pages-hierarchy {
+ padding-left: 0;
+}
+#sidebar div.wiki ul.pages-hierarchy ul {
+ padding-left: 20px;
+}
+#sidebar .private_wiki_flag {
+ display: none !important;
+}
#sidebar p {
margin-top: 5px;
}
@@ -701,6 +713,13 @@ div.wiki ul.toc li {
line-height: 1em;
margin-top: .3em;
}
+div.wiki ul.pages-hierarchy {
+ list-style-type: none;
+ padding-left: 0;
+}
+div.wiki ul.pages-hierarchy ul {
+ padding-left: 40px;
+}
div.wiki .query-totals,
div.wiki .query-issue-links {
font-size: 16px;
@@ -1605,6 +1624,45 @@ form[class$="glossary_style"] #grouping label {
display: none;
}
+ body .flyout-menu div.wiki {
+ padding-left: 0;
+ }
+ body .flyout-menu div.wiki ul,
+ body .flyout-menu div.wiki ol {
+ list-style-type: none;
+ }
+ body .flyout-menu div.wiki p,
+ body .flyout-menu div.wiki li {
+ font-size: 14px;
+ padding-left: 8px;
+ }
+ body .flyout-menu div.wiki p {
+ margin: 8px 0;
+ padding-right: 8px;
+ }
+ body .flyout-menu .private_wiki_flag {
+ display: none !important;
+ }
+ body .flyout-menu p + ul.pages-hierarchy {
+ margin-top: -6px;
+ }
+ body .flyout-menu ul.pages-hierarchy,
+ body .flyout-menu div.wiki ul.pages-hierarchy li,
+ body .flyout-menu ul.pages-hierarchy + p {
+ margin: 0;
+ }
+ body .flyout-menu ul.pages-hierarchy ul,
+ body .flyout-menu div.wiki ul.pages-hierarchy li {
+ padding-left: 0;
+ border-top: 1px solid rgb(255, 255, 255, .1);
+ }
+ body .flyout-menu div.wiki ul.pages-hierarchy li:first-child {
+ border-top: 0;
+ }
+ body .flyout-menu div.wiki ul.pages-hierarchy ul li {
+ padding-left: 20px;
+ }
+
div#content {
padding-left: 3.333333%;
padding-right: 3.333333%;