base/app/views/cheesecake/_index.html.erb in social_stream-0.19.2 vs base/app/views/cheesecake/_index.html.erb in social_stream-0.19.3
- old
+ new
@@ -1,43 +1,49 @@
<div id="contacts_cheesecake"></div>
-<div id="contacts_filter">
- <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>
+<div id="sector_form" style="display:none;">
+ <%= render :partial => "sector_form" %>
</div>
-<div id="contacts_selector_modifiers">
- <span id="contacts_selector_clear">Unselect all</span>
-</div>
-<div id="contacts_grid">
- <div id="contacts_grid_saving" style="display:none;">
- <%= image_tag('loading.gif') %>
+<div id="contacts_explorer">
+ <div id="contacts_filter">
+ <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>
</div>
- <div id="contacts_grid_selected">
- <br class="clearfloat">
+ <div id="contacts_selector_modifiers">
+ <span id="contacts_selector_clear">Unselect all</span>
</div>
- <div id="contacts_grid_available">
- <% @actors.each do |actor|%>
- <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
- <% end %>
+ <div id="contacts_grid">
+ <div id="contacts_grid_saving" style="display:none;">
+ <%= image_tag('loading.gif') %>
+ </div>
+ <div id="contacts_grid_selected">
+ <div id="contacts_grid_selected_hint"><%= t('cheesecake.select.hint') %></div>
+ <br class="clearfloat">
+ </div>
+ <div id="contacts_grid_available">
+ <% @actors.each do |actor|%>
+ <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
+ <% end %>
+ </div>
</div>
-</div>
-<div id="contacts_save" style="display:none;">
- <form action="<%= update_cheesecake_path %>" method="get" data-remote="true" id="contacts_save_form">
- <input type="submit" id="contacts_save_button" value="<%= t('cheesecake.changes.save') %>">
- <input type="hidden" id="contacts_save_changes" name="contacts_save_changes">
- </form>
-</div>
-<div id="contacts_changes_button" style="display:none;">
- <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
-</div>
-<br class="clearfloat">
-<div id="contacts_changes">
- <div id="contacts_changes_title">
- <%= t('cheesecake.changes.details') %>
+ <div id="contacts_changes_button" style="display:none;">
+ <%= t('cheesecake.changes.details') %> (<span id="contacts_changes_button_total">0</span>)
</div>
- <div id="contacts_changes_details">
-
+ <div id="contacts_save" style="display:none;">
+ <form action="<%= update_cheesecake_path %>" method="get" data-remote="true" id="contacts_save_form">
+ <input type="submit" id="contacts_save_button" value="<%= t('cheesecake.changes.save') %>">
+ <input type="hidden" id="contacts_save_changes" name="contacts_save_changes">
+ </form>
</div>
+ <br class="clearfloat">
+ <div id="contacts_changes">
+ <div id="contacts_changes_title">
+ <%= t('cheesecake.changes.details') %>
+ </div>
+ <div id="contacts_changes_details">
+
+ </div>
+ </div>
</div>
<%= javascript_tag do %>
$("#center_body").css("width","782px");
$("#center_body").css("max-width","782px");
$("#content").css("width","782px");
@@ -48,40 +54,40 @@
$("#contacts_grid_extra").css("opacity",0);
});
var unselected_actor_click = function(){
var clone = $(this).clone();
clone.attr("id",$(this).attr("id") + "_selected");
- $(this).slideToggle("fast",function(){
+ $(this).fadeOut("fast",function(){
clone.hide();
$(this).before(clone);
- $("#contacts_grid_selected br.clearfloat").before($(this));
+ $("#contacts_grid_selected_hint").before($(this));
$(this).off("click.unselected_actor");
$(this).on("click.selected_actor", selected_actor_click);
- if($("#contacts_grid_selected").css("display")=="none"){
- $("#contacts_grid_selected").slideToggle("fast");
+ if($("#contacts_grid_selected_hint").css("display")!="none"){
$("#contacts_selector_modifiers").css("opacity",1);
+ $("#contacts_grid_selected_hint").hide();
}
var height = 336 - Math.ceil(($("#contacts_grid_selected").children().length - 1) / 10) * 28;
if(height != $("#contacts_grid_available").height())
$("#contacts_grid_available").animate({height: height});
- $(this).slideToggle("fast");
+ $(this).fadeIn("fast");
});
};
var selected_actor_click = function(){
var clone = $("#" + $(this).attr("id") + "_selected");
- $(this).slideToggle("fast",function(){
+ $(this).fadeOut("fast",function(){
clone.before($(this));
$(this).off("click.selected_actor");
$(this).on("click.unselected_actor", unselected_actor_click);
- if($("#contacts_grid_selected").children().length <= 1){
- $("#contacts_grid_selected").slideToggle("fast");
+ if($("#contacts_grid_selected").children().length <= 2){
$("#contacts_selector_modifiers").css("opacity",0);
+ $("#contacts_grid_selected_hint").fadeIn("fast");
}
var height = 336 - Math.ceil(($("#contacts_grid_selected").children().length - 1) / 10) * 28;
if(height != $("#contacts_grid_available").height())
$("#contacts_grid_available").animate({height: height});
- $(this).slideToggle("fast");
+ $(this).fadeIn("fast");
clone.remove();
});
};
$("#contacts_selector_clear").on("click",function(){
$("#contacts_grid_selected .actor").each(function(){
@@ -99,16 +105,8 @@
$("#contacts_changes_button").tipsy("show");
$("#contacts_changes_title").click(function(){
$("#contacts_changes_button").tipsy("hide");
});
}
- });
- $("#contacts_save_form").submit(function(){
- if($(".contacts_changes_tipsy_menu").length != 0){
- $("#contacts_changes_button").tipsy("hide");
- }
- $("#contacts_grid_saving").show();
- cheese.disable();
- $("#contacts_save_button").val("<%= t('cheesecake.changes.saving') %>").attr("disabled","true");
});
<%= render :partial => 'cheesecake' %>
<% end %>
\ No newline at end of file