manuelcillero/suitepro
manuelcillero/suitepro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corregidos estilos de la lista de páginas hija y la página <Sidebar> del wiki al mostrarla en menú lateral desplegable

Browse source
This commit is contained in:
Manuel Cillero 2019-02-09 08:19:00 +01:00
parent 70726a920b
commit 320de5f168
5 changed files with 90 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -116,7 +116,7 @@ redmine_private_wiki
``` ```
redmine_wiki_lists redmine_wiki_lists
| |
+-- /app/views/issues/_list.html.erb +-- /app/views/issues/_embedded_list.html.erb
| |
+-- /config/locales/en.yml +-- /config/locales/en.yml
| |

4
plugins/redmine_private_wiki/app/views/wiki/date_index.html.erb
View file

@ -27,7 +27,7 @@
<% if !page.private? %> <% if !page.private? %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %></li> <li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %></li>
<% elsif User.current.allowed_to?(:view_privates_wiki, @project) %> <% elsif User.current.allowed_to?(:view_privates_wiki, @project) %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li> <li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
@ -35,7 +35,7 @@
<h3><%= format_date(date) %></h3> <h3><%= format_date(date) %></h3>
<ul> <ul>
<% @pages_by_date[date].each do |page| %> <% @pages_by_date[date].each do |page| %>
<li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %>&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li> <li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %> <span class="private_wiki_flag" style="display:inline-block;" title="<%= l(:private_title) %>"><%= l(:private_flag) %></span></li>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>

3
plugins/redmine_private_wiki/assets/stylesheets/private_wiki.css
View file

@ -6,6 +6,9 @@
border-radius: 2px; border-radius: 2px;
cursor: default; cursor: default;
} }
.private_wiki_flag {
margin-left: .44em;
}
.icon-setprivate{ .icon-setprivate{
background-image: url(../images/hide.png); background-image: url(../images/hide.png);

2
plugins/redmine_private_wiki/lib/wiki_patches/application_helper_patch.rb
View file

@ -20,7 +20,7 @@ module WikiPatches
content << "<li>" content << "<li>"
content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil}, 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)) :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
content << '&nbsp;&nbsp;&nbsp;&nbsp;<span class="private_wiki_flag" style="display:inline-block;" title="' + l(:private_title) + '">' + l(:private_flag) + '</span>' content << ' <span class="private_wiki_flag" style="display:inline-block;" title="' + l(:private_title) + '">' + l(:private_flag) + '</span>'
content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id] content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
content << "</li>\n" content << "</li>\n"
end end

108
public/themes/circlepro/stylesheets/application.css
View file

@ -4,33 +4,33 @@
/* /*
* CirclePro Theme: * CirclePro Theme:
* *
* 1. GENERAL * 1. GENERAL
* 2. FONT ICONS * 2. FONT ICONS
* 3. HEADER * 3. HEADER
* 4. TOP-MENU * 4. TOP-MENU
* 5. SOCIAL-MENU * 5. SOCIAL-MENU
* 6. MAIN-MENU * 6. MAIN-MENU
* 7. SIDEBAR * 7. SIDEBAR
* 8. FOOTER * 8. FOOTER
+ 9. NEWS * 9. NEWS
* 10. WIKI * 10. WIKI
* 11. DOCUMENTS * 11. DOCUMENTS
* 12. FLASH MESSAGES * 12. FLASH MESSAGES
* 13. LOGIN FORM * 13. LOGIN FORM
* 14. TAGS * 14. TAGS
* 15. CONTEXT-MENU * 15. CONTEXT-MENU
* 16. TIP * 16. TIP
* 17. jQuery UI * 17. jQuery UI
* 18. BUTTONS * 18. BUTTONS
* 19. FORMS COMMON * 19. FORMS COMMON
* 20. FORMS SPECIFIC * 20. FORMS SPECIFIC
* 21. TABS * 21. TABS
* 22. TABLES * 22. TABLES
* 23. OBJECTS * 23. OBJECTS
* 24. GLOSSARY * 24. GLOSSARY
* 25. RESPONSIVE * 25. RESPONSIVE
* 26. SELECT2 * 26. SELECT2
* 27. PRINTING * 27. PRINTING
* *
* Based on Circle Theme by Kirill Bezrukov. * Based on Circle Theme by Kirill Bezrukov.
*/ */
@ -588,6 +588,9 @@ ul.social-menu .social-link-mail:hover a {
#sidebar div#admin-menu { #sidebar div#admin-menu {
margin-top: 10px; margin-top: 10px;
} }
#sidebar div.wiki {
margin-top: 0;
}
#sidebar div.wiki p, #sidebar div.wiki p,
#sidebar div.wiki li { #sidebar div.wiki li {
font-size: 16px; font-size: 16px;
@ -598,6 +601,15 @@ ul.social-menu .social-link-mail:hover a {
margin-top: 0; margin-top: 0;
padding-left: 20px; 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 { #sidebar p {
margin-top: 5px; margin-top: 5px;
} }
@ -701,6 +713,13 @@ div.wiki ul.toc li {
line-height: 1em; line-height: 1em;
margin-top: .3em; 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-totals,
div.wiki .query-issue-links { div.wiki .query-issue-links {
font-size: 16px; font-size: 16px;
@ -1605,6 +1624,45 @@ form[class$="glossary_style"] #grouping label {
display: none; 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 { div#content {
padding-left: 3.333333%; padding-left: 3.333333%;
padding-right: 3.333333%; padding-right: 3.333333%;