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

Merge branch 'nccu_fix_matt'

This commit is contained in:
Matthew K. Fu JuYuan 2012-08-08 16:15:49 +08:00
parent 959def6c1f 1b35415699
commit 2158e0a879
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb vendored
View File

@ -35,16 +35,18 @@
</div> </div>
</div> </div>
</div> </div>
<div id="widget-status"> <% if show_form_status_field(@bulletin)%>
<div class="control-group"> <div id="widget-status">
<label class="control-label"><%= t(:status) %></label> <div class="control-group">
<div class="controls"> <label class="control-label"><%= t(:status) %></label>
<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label> <div class="controls">
<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label> <label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label> <label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
</div>
</div> </div>
</div> </div>
</div> <% end -%>
<div id="widget-role"> <div id="widget-role">
<div class="control-group"> <div class="control-group">
<label class="control-label">Role</label> <label class="control-label">Role</label>

19
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb vendored
View File

@ -35,16 +35,19 @@
</div> </div>
</div> </div>
</div> </div>
<div id="widget-status"> <% if news_show_form_status_field(@news_bulletin)%>
<div class="control-group"> <div id="widget-status">
<label class="control-label"><%= t(:status) %></label> <div class="control-group">
<div class="controls"> <label class="control-label"><%= t(:status) %></label>
<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label> <div class="controls">
<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label> <label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label> <label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
</div>
</div> </div>
</div> </div>
</div> <% end -%>
<div id="widget-role"> <div id="widget-role">
<div class="control-group"> <div class="control-group">
<label class="control-label">Role</label> <label class="control-label">Role</label>