social_stream 1.1.12 → 2.0.0.beta1

data/base/app/views/profiles/_profile.html.erb

@@ -1,40 +1,33 @@
-<div class="space_center"></div>
-<h2><%=t('menu.information')%></h2>
-<div class="space_center"></div>
+<div id="profile-info">
+  <h2>
+    <%= t('profile.one') %>
+  </h2>
 
-<% if (!is_personal_empty?) or(is_owner?)%>
-  <%= render :partial=> "personal"%>
-<%end%>
+  <% if can?(:update, @profile) || @profile.tags_present? %>
+    <%= render partial: "tags" %>
+  <% end %>
 
-<%  if  @profile.subject.subject_type == 'Event' %>
-  <%= render :partial=> "outline", :locals => {:profile => @profile} %>
-<% end %>
+  <% if can?(:update, @profile) || @profile.personal_present? %>
+    <%= render partial: "personal" %>
+  <% end %>
 
-<% if (!is_contact_empty?) or(is_owner?)%>
-  <%= render :partial=> "contact"%>
-<%end%>
-<% if (@profile.experience?) or(is_owner?)%>
-  <%= render :partial=> "experience"%>
-<%end%>
-<% if is_owner? %>
-  <div class="space_center"></div>
-  <div class="block" id="avatar_info">
-    <div class="header">
-      <div class="header_text">
-        <%= t('avatar.profile_change')%>
-      </div>
-      <div class="header_icon_right">
-        <%= link_to (image_tag('btn/edit.png')),  :controller => "avatars" , :action => "index" %>
-      </div>
-    </div>
-    <div class="content">
-      <div class="row">
-      </div>
-    </div>
-  </div>
-<% end %>
-<div class="space_center"></div>
-<% if (@profile.subject.tag_list.count > 0) or (is_owner?) %>
-  <%= render :partial=>"tags"%>
-<% end %>
+  <% if can?(:update, @profile) || @profile.contact_present? %>
+    <%= render :partial => "comunication-info" %>
+  <% end %>
 
+  <% if can?(:update, @profile) || @profile.experience? %>
+    <%= render :partial => "experience" %>
+  <% end %>
+
+  <% if can?(:update, @profile) || @profile.personal_present? %>
+    <%= render :partial => "avatar" %>
+  <% end %>
+
+  <%= javascript_tag do %>
+    $(function() {
+      SocialStream.Profile.show({
+        section: "<%= params[:section ] %>"
+      });
+    });
+  <% end %>
+</div>

data/base/app/views/profiles/_tags.html.erb

@@ -1,22 +1,26 @@
-  <div class="block" id="tags_info">
-    <div class="header">
-      <div class="header_text">
-        <%=t('profile.tags.other')%>
-      </div>
-      <% if is_owner? %>
-        <div class="header_icon_right">
-          <%= link_to (image_tag('btn/edit.png')), :controller => :profiles , 
-                       :action => :edit, :section => "tags"%>
-        </div>
+<section class="tags">
+  <header>
+    <%= render partial: 'edit_icon' %>
+    <h4>
+      <%= t('profile.tags.other') %>
+    </h4>
+  </header>
+
+
+  <div class="briefing">
+    <% if @profile.subject.tag_list.count > 0 %>
+      <%= tag_list @profile.subject %>
+    <% else %>
+      <%= render partial: 'empty' %>
+    <% end %>
+  </div>
+
+  <% if can?(:update, @profile) %>
+    <div class="update">
+      <%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
+        <%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
+        <%= f.submit :class => "btn" %>
       <% end %>
     </div>
-    <div class="content">
-      <div class="field">
-        <% if @profile.subject.tag_list.count > 0 %>
-          <%= @profile.subject.tag_list %>
-        <%else%>
-          <%=t('profile.empty')%>
-        <%end%>
-      </div>
-    </div>
-  </div>
+  <% end %>
+</section>

data/base/app/views/profiles/show.html.erb

@@ -1,22 +1,22 @@
 <% content_for :title do%>
   <%= @profile.subject.name %>
-<%end%>
+<% end %>
+
 <% if @profile.description? %>
   <% content_for :description do %>
-    <%= @profile.description%>
+    <%= @profile.description %>
   <% end %>
-<%end%>
+<% end %>
 
 <% content_for :keywords do %>
   <%= @profile.subject.tag_list%>
 <% end %>
 
-<% sidebar %>
-
-<% toolbar :profile, :subject => @profile.subject %>
-
+<section id="profile">
 
-<%= location(link_to(t('menu.information'), [@profile.subject, :profile])) %>
+  <%= render partial: 'toolbar/profile', locals: { :subject => @profile.subject } %>
 
+  <%= render :partial => "profile" %>
 
-<%= render :partial => "profile" %>
+  <%= render partial: 'sidebar/show' %>
+</section>

data/base/app/views/profiles/update.js.erb

@@ -1,15 +1,16 @@
+if ($("#profile_notice").length == 0){
+  $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  
+} 
+	
 <% if @profile.valid? %>
-  <% flash[:notice] = t('profile.update.success') %>
-  document.location.href="<%= polymorphic_path([ current_subject, :profile ]) %>";
+  $("#profile_notice").html("<%= t('profile.update.success')%>");
+  $("#profile_notice").removeClass('error');
+  $("#profile_notice").addClass('success');
 <% else %>
-  if ($("#profile_notice").length == 0){
-    $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  
-  } 
   $("#profile_notice").html("<h2><%= pluralize(@profile.errors.count, "error") %> <%= t('profile.update.error')%></h2>"
 	 +"<ul><% @profile.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>");
-	$("#profile_notice").removeClass('success');
-	$("#profile_notice").addClass('error'); 
-
+  $("#profile_notice").removeClass('success');
+  $("#profile_notice").addClass('error'); 
 <% end %>
 
 

data/base/app/views/relation/customs/_custom.html.erb

@@ -0,0 +1,27 @@
+<%= div_for custom do %>
+  <%= radio_button_tag :relation_custom,
+    custom.id,
+    false,
+    :id => "input_#{ dom_id custom }" %>
+  <%= label_tag "input_#{ dom_id custom }", custom.name %>
+
+  <div class="actions">
+    <%= link_to '#', class: "edit" do %>
+      <i class="icon_tool16-edit"></i>
+    <% end %>
+
+    <%= link_to custom, class: "delete", method: :delete, confirm: t('relation_custom.confirm_delete'), remote: true do %>
+      <i class="icon_tool16-trash"></i>
+    <% end %>
+  </div>
+
+  <div class="edit_name">
+    <%= form_for custom, url: polymorphic_path(custom, section: 'name'), :remote => true do |f| %>
+      <%= f.text_field :name %>
+
+      <%= link_to '#', class: "submit" do %>
+        <i class="icon_tool16-ok"></i>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

data/base/app/views/relation/customs/_form.html.erb

@@ -15,9 +15,9 @@
     </div>
   <% end %>
 
-  <p><%= f.text_field :name, :class => "privacy_input_new", :size => 20 %></p>
-  <%= f.submit nil, :class => "button" %>
-  <button class="button" id="cancel_new_relation_custom" ><%= t('button.cancel') %></button>
+  <%= f.text_field :name %>
+
+  <%= f.submit nil, :class => "btn" %>
 <% end %>
 
 <%= javascript_tag do %>

data/base/app/views/relation/customs/_list.html.erb

@@ -1,67 +1,13 @@
-<table class="tableCheckBoxOptions">
-  <% list.each do |r| %>
-    <%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
-      <div contain="<%= dom_id(r) %>" class="checkboxOptionLeft">
-        <input id="<%= dom_id(r) %>" type="radio" name="relation_custom"/>
-        <label for="<%= dom_id(r) %>"><%=r.name%></label>
-        <div class="options">
-          <%= link_to image_tag("btn/edit.png", :class => "menu_icon", :title => t('relation_custom.edit')), '#', :class => "relation_custom_edit_link" %>
-          <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('relation_custom.delete')), r, :class => "relation_custom_delete_link", :method => :delete, :confirm => t('relation_custom.confirm_delete') %>
-
-        </div>
-        <div class="relation_custom_name_form">
-          <%= form_for r, :remote => true do |f| %>
-            <p><%= f.text_field :name, :class => "privacy_input_new", :size => 18 %></p>
-            <%= f.submit nil, :class => "button" %>
-            <button class="button cancel_edit_relation_custom" ><%= t('button.cancel') %></button>
-          <% end %>
-        </div>
-        <div class="clearfloat"></div>
-      </div>
-    <%= raw cycle("</td>", "</td></tr>", :name => "end_cell") %>
-  <% end %>
-
-  <%= raw cycle("<tr><td>", "<td>", :name => "begin_cell") %>
-    <div id="new_relation">
-      <div id="new_relation_custom_title_block"> 
-        <a href="#"><span id="new_relation_custom_title" class="privacy_span_new"><%= t('relation_custom.new') %></span></a>
-      </div> 
-      <div id="new_relation_custom_input_block"> 
-        <%= render :partial => 'relation/customs/form' %>
-      </div>
-    </div>
-  <%= raw cycle("</td>", "</td></tr>", :name => "end_cell") %>
-
-  <%= raw("</tr>") if list.size.odd? %>
-
-</table>
-
-<%= javascript_tag do %>
-  $(function(){
-    $('#relation_customs_list :radio').change(function(){
-      $("#new_relation_custom_title_block").show();
-      $("#new_relation_custom_input_block").hide();
-      selectRelation(this);
-    });
-    
-    $('.relation_custom_edit_link').click(function() {
-      $(this).parent().hide();
-      $(this).parent().siblings('label').hide();
-      $(this).parent().siblings('.relation_custom_name_form').show();
-    });
-
-    $(".cancel_edit_relation_custom").click(function() {   
-      $(this).parent().parent().hide();
-      $(this).parent().parent().siblings('label, .options').show();
-
-      return false;
-    });
-
-    $("#new_relation_custom_title").click(function() {
-      $("#permissions_list").hide();
-      $("#privacy_rules").hide();
-      $("#new_relation_custom_title_block").hide();
-      $("#new_relation_custom_input_block").show();
-    });
-  })
-<% end %>
+<section class="relation_list" data-permissions_path="<%= permissions_path %>">
+  <h4>
+    <%= t 'relation_custom.list.title' %>
+  </h4>
+
+  <%= render list %>
+   
+  <div id="new_relation">
+    <%= link_to t('relation_custom.new'), '#', class: 'new' %>
+
+    <%= render :partial => 'relation/customs/form' %>
+  </div> 
+</section>

data/base/app/views/relation/customs/create.js.erb

@@ -1,21 +1,11 @@
-<% if @custom.errors.present? %>
-  $('#new_relation_custom_input_block').html("<%= escape_javascript render(:partial => 'relation/customs/form') %>");
-<% else %>
-  // Hide #relations and #permissions
-  $('#permissions').html("");
-  $('#permissions').hide();
-
-  // Restore form
-  $('#relation_custom_name').val('');
-  $('#new_relation_custom_input_block').hide();
-  $('#new_relation_custom_title_block').show();
-
-  // Refresh list
-  $('#relation_customs_list').html("<%= escape_javascript render(:partial => 'relation/customs/list', :object => current_subject.relation_customs) %>");
-
-
-  $(function(){
-    selectRelation($('#' + '<%= dom_id @custom %>'));
+<% if @custom.valid? %>
+  SocialStream.RelationCustom.create({
+    relation: {
+      id:   <%= @custom.id %>,
+      html: "<%= j render(@custom) %>"
+    }
   });
+<% else %>
+  SocialStream.Flash.error('<%= @custom.errors.full_messages.to_sentence %>');
 <% end %>
 

data/base/app/views/relation/customs/destroy.js.erb

@@ -0,0 +1,8 @@
+<% if @custom.destroyed? %>
+  SocialStream.RelationCustom.destroy({
+    relation: {
+      id: <%= @custom.id %>
+    }
+  });
+<% else %>
+<% end %>

data/base/app/views/relation/customs/index.html.erb

@@ -1,43 +1,24 @@
-<% toolbar :profile, :subject => current_subject, :option => 'contacts' %>
+<section id="relation_customs">   
+  <%= render partial: 'toolbar/profile', locals: { :subject => current_subject } %>
 
-<div id="wrapper_section">   
+  <section class="relation_customs">
+    <h2><%= t 'relation_custom.title' %></h2>
 
-  <p class="pageTitle"><%= t 'relation_custom.title' %></p>
-
-  <div id="relation_customs" class="privacy_block_section first_block_section">
-    <p class="sectionTitle"><%= t 'relation_custom.choose' %></p>
-
-
-    <%= javascript_tag do %>
-      $(function() {
-        $("#loading").hide();
-
-        $("#loading").ajaxStart(function(){
-           $(this).show();
-        });
-
-        $("#loading").ajaxStop(function(){
-           $(this).hide();
-        });
-
-      })
-    <% end %>
-
-    <div id="relation_customs_list">
       <%= render :partial => 'relation/customs/list', :object => @customs %>
-    </div>
-
-</div>
-
-
-  <div id="permissions" class="privacy_block_section">
-  </div>
-
-  <div id="loading"></div>
 
-  <%= javascript_tag do %>
-    $(function() {
-      $("#permissions").hide();
-    })
-  <% end %>
-</div> 
+      <div id="permissions">
+        <div class="postit rotate">
+          <span class="rotate-int">
+            <%= t 'permission.postit' %>
+          </span>
+        </div>
+        <%= render partial: 'layouts/loading' %>
+      </div>
+
+      <%= javascript_tag do %>
+        $(function() {
+          SocialStream.RelationCustom.index();
+        })
+      <% end %>
+  </section> 
+</section> 

data/base/app/views/relation/customs/update.js.erb

@@ -1,11 +1,11 @@
-<% if params[:section] == 'rules' %>
-  <%= render :partial => 'update_rules' %>
+<% if @custom.valid? %>
+  SocialStream.RelationCustom.update({
+    relation: {
+      id: <%= @custom.id %>,
+      name: "<%= @custom.name %>"
+    },
+    section: '<%= params[:section] %>'
+  });
 <% else %>
-  var div = $('div[contain$=<%= dom_id(@custom) %>]');
-  div.children('label').html("<%= escape_javascript @custom.name %>");
-  div.children('label').show();
-  div.children('.options').show();
-  div.children('.relation_custom_name_form').hide();
-<% end %>
-
 
+<% end %>

data/base/app/views/repositories/_filter.html.erb

@@ -0,0 +1 @@
+<%= text_field_tag :q, nil,:autocomplete => :off, :placeholder => t('repository.filter'), class: 'filter', 'data-path' => polymorphic_path([:search, profile_or_current_subject, :repository]) %>

data/base/app/views/repositories/show.html.erb

@@ -0,0 +1,26 @@
+<section id="repository">
+  <% if profile_subject? %>
+    <%= render partial: 'toolbar/profile', locals: { subject: profile_subject } %>
+  <% else %>
+    <%= render partial: 'toolbar/home' %>
+  <% end %>
+
+  <h1><%= t 'repository.title' %></h1>
+
+  <%= render partial: 'filter' %>
+
+  <%= render partial: 'common_documents/new_button',
+             locals: { owner: profile_or_current_subject } %>
+
+  <section class="repository">
+    <%= render partial: 'layouts/loading' %>
+
+    <section class="repository-list">
+      <%= render @collection %>
+    </section>
+  </section>
+
+  <%= javascript_tag do %>
+    SocialStream.Repository.show();
+  <% end %>
+</section>