Changes in orbit_bar and js in announcements

This commit is contained in:
Christophe Vilayphiou committed 2012-02-23 15:51:33 +08:00
1 parent 48d94d5e15
commit ba4d71a026
18 files changed
+127 -51

No files matched your search

@@ -1,6 +1,6 @@
class Panel::Announcement::BackEnd::BulletinCategorysController < ApplicationController
layout 'admin'
layout 'new_admin'
def index
@bulletin_categorys = BulletinCategory.all
@@ -1,4 +1,4 @@
<tr id="<%= dom_id bulletin %>">
<tr id="<%= dom_id bulletin %>" class="with_action">
<td><input type="checkbox"></td>
<td>
<% if bulletin.is_top? %>
@@ -14,13 +14,13 @@
<ul class="nav nav-pills hide">
<li><%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Quick Edit<b class="caret"></b></a>
<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
<ul class="dropdown-menu" id="menu1">
<li><a href="#">Basic</a></li>
<li><a href="#">Picture</a></li>
<li><a href="#">Tags</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">File</a></li>
<li><a href="#" class='toggle-tr-edit' rel='basic'><%= t(:basic) %></a></li>
<li><a href="#" class='toggle-tr-edit' rel='picture'><%= t(:picture) %></a></li>
<li><a href="#" class='toggle-tr-edit' rel='tags'><%= t(:tags) %></a></li>
<li><a href="#" class='toggle-tr-edit' rel='link'><%= t(:link) %></a></li>
<li><a href="#" class='toggle-tr-edit' rel='file'><%= t(:file) %></a></li>
</ul>
</li>
<li class="dropdown"><%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
@@ -1,12 +1,13 @@
<!-- <tr class="qe-block hide"> -->
<tr class="qe-block">
<tr class="qe-block hide">
<td colspan="8">
<legend>Quick Edit - Basic / Picture / Tags / Link / File</legend>
<legend><%= t(:quick_edit) %> - <span class='qe_title'></span>Basic / Picture / Tags / Link / File</legend>
<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_path(bulletin), :html => {:class => 'form-horizontal'} do |f| %>
<%= render :partial => "quick_edit_basic", :locals => { :f => f, :bulletin => bulletin } %>
<%= render :partial => "quick_edit_picture", :locals => { :f => f, :bulletin => bulletin } %>
<%#= render :partial => "quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %>
<%= render :partial => "quick_edit_tags", :locals => { :f => f, :bulletin => bulletin } %>
<%= render :partial => "quick_edit_links", :locals => { :f => f, :bulletin => bulletin } %>
<%= render :partial => "quick_edit_files", :locals => { :f => f, :bulletin => bulletin } %>
<div class="form-actions">
<%= f.submit t(:submit), :class => 'btn btn-primary' %>
<%= f.submit t(:cancel), :class => 'btn', :type => 'reset' %>
@@ -1,4 +1,4 @@
<div id="qe-basic">
<div id="qe-basic" class="qe-edit-div hide">
<div id="widget-category">
<div class="control-group">
<label class="control-label"><%= t(:category) %></label>
@@ -1,4 +1,4 @@
<div id="qe-file">
<div id="qe-file" class="qe-edit-div hide">
<div id="widget-file">
<div class="control-group">
<table class="table table-condensed">
@@ -1,4 +1,4 @@
<div id="qe-link">
<div id="qe-link" class="qe-edit-div hide">
<div id="widget-link">
<div class="control-group">
<table class="table table-condensed">
@@ -1,4 +1,4 @@
<div id="qe-picture">
<div id="qe-picture" class="qe-edit-div hide">
<div id="widget-picture">
<div class="control-group">
<label class="control-label">Picture</label>
@@ -32,7 +32,7 @@
</div>
</div> -->
<div id="qe-tags">
<div id="qe-tags" class="qe-edit-div hide">
<div id="widget-tags">
<div class="form-horizontal">
<% @tags.each do |tag| %>