developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap

This commit is contained in:
Matt 2012-05-09 15:04:52 +08:00
parent 0bcfac8177 1785da51a2
commit 695b779e4b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/style.css.erb
View File

@ -682,6 +682,9 @@
resize: none; resize: none;
max-height: 500px; max-height: 500px;
} }
#banner [id^="slideshow-"] {
z-index: 2 !important;
}
[class^="icons-"] { [class^="icons-"] {
display: inline-block; display: inline-block;
width: 16px; width: 16px;

4
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_side_bar.html.erb vendored
View File

@ -13,8 +13,8 @@
<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> <h3 class="h3"><%= t('announcement.tag_cloud') %></h3>
<div class="cloud"> <div class="cloud">
<% @tags.each do |tag| %> <% @tags.each do |tag| %>
<%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{tag.id.to_s.eql?(params[:tag_id]) ? 'active' : nil}" %> <%= link_to tag[I18n.locale], panel_announcement_front_end_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
<% end %> <% end %>
</div> </div>
</div> </div>
<!-- <div class="clear"></div> --> <!-- <div class="clear"></div> -->

2
vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb vendored
View File

@ -13,7 +13,7 @@
<h3 class="h3"><%= t('announcement.tag_cloud') %></h3> <h3 class="h3"><%= t('announcement.tag_cloud') %></h3>
<div class="cloud"> <div class="cloud">
<% @tags.each do |tag| %> <% @tags.each do |tag| %>
<%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{tag.id.to_s.eql?(params[:tag_id]) ? 'active' : nil}" %> <%= link_to tag[I18n.locale], panel_news_front_end_news_bulletins_path(:tag_id => tag.id), :class => "hot#{rand(4) + 1} #{(tag.id.to_s.eql?(params[:tag_id]) || tag.key.eql?(params[:tag_id])) ? 'active' : nil}" %>
<% end %> <% end %>
</div> </div>
</div> </div>