amalgam 2.1.1

data/app/helpers/amalgam/editor/properties_builder_helper.rb

@@ -0,0 +1,143 @@
+module Amalgam
+  module Editor::PropertiesBuilderHelper
+    include Mercury::Authentication
+    def properties_for(record, options = {}, &proc)
+      return unless can_edit?
+      defaults = {
+        :builder => PropertyFormBuilder,
+        :url => amalgam.admin_editor_path,
+        :method => :put,
+        :remote => true,
+        :html => { :style => 'width:450px;padding-bottom:30px;' }
+      }
+
+      options.reverse_merge!(defaults)
+      form = form_for(record,options) do |f|
+        yield(f)
+        concat('<hr/>'.html_safe)
+        concat(f.submit(:class => 'btn btn-primary'))
+      end
+      content_tag(:script, form , :type => "text/html" ,:id => 'property-form')
+    end
+
+    class PropertyFormBuilder < ActionView::Helpers::FormBuilder
+
+      def string(attribute, options={})
+        field_with_label(:text_field,attribute,options)
+      end
+
+      def text(attribute, options={})
+        field_with_label(:text_area,attribute,options)
+      end
+
+      def attachment(name, options={})
+        options[:class] ||= 'input-xlarge'
+        index_create
+        obj = object.attachments[name]
+        @buffer = label("#{I18n.t('amalgam.attachment')} : #{name}",options.delete(:lable_options)||{:style => 'font-weight:bold;'})
+        @buffer.concat '<div style = "border-bottom: solid #cccccc 1px;padding:5px; margin-bottom:3px;">'.html_safe
+        @buffer.concat label(I18n.t("amalgam.description")+':',:style => "display:inline;margin-right:35px;")
+        @buffer.concat attachment_field(:text_field, :description, obj.try(:description), options)
+        @buffer.concat '<br>'.html_safe
+        @buffer.concat label(I18n.t("amalgam.file_upload")+':',:style => "display:inline;margin-right:10px;")
+        @buffer.concat attachment_field(:file_field, :file)
+        @buffer.concat '<br>'.html_safe
+        if obj.try(:content_type).to_s =~ /image/
+          @buffer.concat label(I18n.t("amalgam.file_pre")+':',:style => "display:inline;margin-right:10px;")
+          @buffer.concat @template.image_tag(obj.file.thumb.url)
+        else
+          @buffer.concat "<a href= '#{obj.file.try(:url)}'>#{I18n.t("amalgam.file_download")}</a>".html_safe if obj
+        end
+        @buffer.concat attachment_field(:hidden_field, :name, name)
+        @buffer.concat attachment_field(:hidden_field, :id, obj.id) if obj.try(:persisted?)
+        @buffer.concat '</div>'.html_safe
+        @buffer.html_safe
+      end
+
+      def attachment_list(name, options={})
+        options[:class] ||= "attachment_list_#{name}"
+        @buffer = @template.content_tag(:div,options) do
+          buffer = label("#{I18n.t('amalgam.attachment_list')} : #{name}",options.delete(:lable_options)||{:style => 'font-weight:bold;'})
+          objs = object.attachments[name] || []
+          objs.each do |obj|
+            buffer.concat attachment_item(obj).html_safe
+          end
+          buffer
+        end
+
+        link = @template.link_to('#', :class => 'new_attachment', :name => name, :data => {"model-id" => object.id, "type" => object.class.to_s.underscore}) do
+          "<i class=\"icon-plus\"></i>#{::I18n.t('amalgam.admin.actions.new')}".html_safe
+        end
+        @buffer.concat link
+      end
+
+      protected
+
+      def attachment_item(attachment)
+        index_create
+        @template.content_tag(:div,options) do
+          buffer = '<div style = "border-bottom: solid #cccccc 1px;padding:5px; margin-bottom:3px;">'.html_safe
+          buffer.concat label(I18n.t("amalgam.description")+':',:style => "display:inline;margin-right:35px;")
+          buffer.concat attachment_field(:text_field, :description, attachment.try(:description), :class => 'input-xlarge')
+          buffer.concat '<br>'.html_safe
+          buffer.concat label(I18n.t("amalgam.file_upload")+':',:style => "display:inline;margin-right:10px;")
+          buffer.concat attachment_field(:file_field, :file)
+          buffer.concat destroy_field(attachment)
+          buffer.concat '<br>'.html_safe
+          if attachment.try(:content_type).to_s =~ /image/
+            buffer.concat label(I18n.t("amalgam.file_pre")+':',:style => "display:inline;margin-right:10px;")
+            buffer.concat @template.image_tag(attachment.file.thumb.url)
+          else
+            buffer.concat "<a href= '#{attachment.file.try(:url)}'>#{I18n.t("amalgam.file_download")}</a>".html_safe if attachment
+          end
+          buffer.concat attachment_field(:hidden_field, :name, attachment.name)
+          buffer.concat attachment_field(:hidden_field, :id, attachment.id) if attachment.try(:persisted?)
+          buffer.concat '</div>'.html_safe
+          buffer.html_safe
+        end
+      end
+
+      private
+
+      def field_with_label(type,attribute,options)
+        label(attribute,options.delete(:lable_options)||{}) + field(type,attribute,options)
+      end
+
+      def field(type,attribute,options)
+        add_default_name(attribute,options)
+        if(attribute.to_s.include?('.'))
+          val = attribute.split('.').unshift(object).reduce do |value,key|
+            value[key]
+          end
+          options[:value] = val
+        end
+        self.send(type,attribute,options)
+      end
+
+      def attachment_field(type,field,value = nil,options={})
+        options[:name] ||= name_for_attribute('attachments_attributes') + "[#{@index}][#{field.to_s}]"
+        options[:value] ||= value
+        self.send(type,"attachment.#{field}",options)
+      end
+
+      def destroy_field(attachment,options={})
+        name = name_for_attribute('attachments_attributes') + "[#{@index}][_destroy]"
+        buffer = @template.check_box_tag name
+        buffer.concat ::I18n.t('amalgam.admin.actions.destroy')
+        buffer
+      end
+
+      def add_default_name(attribute,options)
+        options[:name] ||= name_for_attribute(attribute)
+      end
+
+      def name_for_attribute(attribute)
+        "[content][#{object.class.to_s.tableize}/#{object.id.to_s}.#{attribute.to_s}][value]"
+      end
+
+      def index_create
+        @index = SecureRandom.uuid
+      end
+    end
+  end
+end

data/app/helpers/amalgam/pages_helper.rb

@@ -0,0 +1,14 @@
+module Amalgam
+  module PagesHelper
+    def link_to_page(page,options={},&block)
+      title = options.delete(:title) || page.title
+      url   = options.delete(:url) || page_path(page.slug)
+      condition = options.delete(:if)
+      if condition.nil?
+        link_to(title,url,options,&block)
+      else
+        link_to_if(condition,title,url,options,&block)
+      end
+    end
+  end
+end

data/app/helpers/amalgam/url_helper.rb

@@ -0,0 +1,48 @@
+module Amalgam
+  module UrlHelper
+    def locale_url(locale)
+      available_locales = ::I18n::available_locales.collect{|m| m.to_s.downcase}
+
+      path_list = request.fullpath.split('/')
+      if path_list.present?
+        if available_locales.include?(path_list[1].downcase)
+          path_list[1] = locale
+          return "#{request.protocol}#{request.host_with_port}#{path_list.join('/')}"
+        end
+      else
+        return "#{request.protocol}#{request.host_with_port}/#{locale}"
+      end
+
+      if locale_param = request.fullpath.match(/locale=[\w|-]*/)
+        url = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+        url[locale_param[0]] = "locale=#{locale}"
+        return url
+      end
+
+      domain_list = request.host_with_port.split('.')
+      if available_locales.include?(domain_list.first.downcase)
+        domain_list[0] = locale
+        return "#{request.protocol}#{domain_list.join('.')}#{request.fullpath}"
+      end
+
+      if request.fullpath.include?('?')
+        return "#{request.protocol}#{request.host_with_port}#{request.fullpath}&locale=#{locale}"
+      else
+        return "#{request.protocol}#{request.host_with_port}#{request.fullpath}?locale=#{locale}"
+      end
+    end
+
+    def with_subdomain(subdomain)
+      subdomain = (subdomain || "")
+      subdomain += "." unless subdomain.empty?
+      [subdomain, request.domain, request.port_string].join
+    end
+
+    def url_for(options = nil)
+      if options.kind_of?(Hash) && options.has_key?(:subdomain)
+        options[:host] = with_subdomain(options.delete(:subdomain))
+      end
+      super
+    end
+  end
+end

data/app/views/amalgam/admin/_nav_bar.html.haml

@@ -0,0 +1,28 @@
+.navbar.navbar-fixed-top
+  .navbar-inner
+    .container
+      .nav-collapse
+        %h3.brand
+          =link_to 'Amalgam', '/'
+        %ul.nav
+          = controller_links
+          = drop_down Amalgam::Models::Group.model_name.human,'#', :controller => "amalgam/admin/groups" do
+            = dropdown_item(t('amalgam.admin.actions.index'), amalgam.admin_groups_path)
+            = dropdown_item(t('amalgam.admin.actions.new'), amalgam.new_admin_group_path)
+          - if Amalgam.i18n
+            = drop_down t("amalgam.locales.#{I18n.locale.to_s}"), '#' do
+              - I18n::available_locales.each do |locale|
+                = dropdown_item(t("amalgam.locales.#{locale.to_s}"), locale_url(locale.to_s.downcase))
+        %ul.nav.pull-right
+          - if editor
+            %li.edit
+              %a{:href => '#'}= t('amalgam.admin.actions.edit')
+          %li.divider-vertical
+          - if admin_signed_in?
+            %li.dropdown
+              %a.dropdown-toggle{"data-toggle" => "dropdown"}
+                = current_admin.username
+                %b.caret
+              %ul.dropdown-menu
+                %li= link_to(t('amalgam.sessions.actions.edit_info'),amalgam.edit_info_path('admin_user'))
+                %li= link_to(t('amalgam.sessions.actions.sign_out'), amalgam.signout_path("admin_user"), :method => 'delete')

data/app/views/amalgam/admin/groups/_form.html.haml

@@ -0,0 +1,9 @@
+%article
+  = form_for @group, :as => :group, :url => (method=='post' ? admin_groups_path : admin_group_path(@group)) do |f|
+    %legend="#{t('amalgam.admin.actions.'+type)}#{Amalgam::Models::Group.model_name.human}"
+    = f.label :name
+    = f.text_field :name, :required => true, :autofocus => true
+    %hr
+    %p
+      = f.submit :class => "btn-primary btn"
+      = link_to t("amalgam.admin.a.back"), admin_groups_path, :class => "btn"

data/app/views/amalgam/admin/groups/edit.html.haml

@@ -0,0 +1 @@
+= render :partial =>'form', :locals => {:type => 'edit', :method => 'put'}

data/app/views/amalgam/admin/groups/index.html.haml

@@ -0,0 +1,19 @@
+%article
+  %h3
+    = Amalgam::Models::Group.model_name.human
+
+  %table.table.table-striped
+    %tr
+      %th=Amalgam::Models::Group.human_attribute_name("name")
+      %th
+      %th
+
+    - @groups.each do |group|
+      %tr
+        %td= group.name
+        %td= link_to t('amalgam.admin.actions.edit'), edit_admin_group_path(group)
+        %td= link_to t('amalgam.admin.actions.destroy'), admin_group_path(group), :confirm => t('amalgam.admin.confirmation.delete', :model => Amalgam::Models::Group.model_name.human), :method => :delete
+
+  %br
+
+  = link_to "#{t('amalgam.admin.actions.new')}#{Amalgam::Models::Group.model_name.human}", new_admin_group_path

data/app/views/amalgam/admin/groups/new.html.haml

@@ -0,0 +1 @@
+= render :partial =>'form', :locals => {:type => 'new',:method => 'post'}

data/app/views/amalgam/admin/pages/_fields.html.haml

@@ -0,0 +1,10 @@
+= af.label :title
+= af.text_field :title, :required => true
+= af.label :slug
+= af.text_field :slug, :required => true
+%fieldset
+  =af.label :group_ids
+  -Amalgam::Models::Group.all.each do |group|
+    %label.checkbox.inline
+      =check_box_tag 'page[group_ids][]', group.id, af.object.group_ids.include?(group.id)
+      =group.name

data/app/views/amalgam/admin/pages/_form.html.haml

@@ -0,0 +1,9 @@
+= form_for([:admin,@page],:html => {:class => 'basic'}) do |f|
+  %legend=title
+  = render :partial => 'fields', :locals => {:af => f}
+  = f.label :parent_id
+  = f.select :parent_id, nested_set_options(Page, @page) {|i, level| "#{'-' * level} #{i.title}" },{ :include_blank => true }
+  %hr
+  %p
+    = f.submit :class => 'btn btn-primary'
+    = link_to t("amalgam.admin.a.back"), admin_pages_path ,:class => 'btn'

data/app/views/amalgam/admin/pages/_inline_form.html.haml

@@ -0,0 +1,6 @@
+= form_for([:admin,@page],:remote => true) do |f|
+  = render :partial => 'fields', :locals => {:af => f}
+  = f.hidden_field :parent_id
+  %hr
+  = f.submit :class => 'btn btn-primary'
+  = link_to t("amalgam.admin.actions.cancel"), '#' ,:class => 'btn btn-cancel'

data/app/views/amalgam/admin/pages/_tree_inner.html.haml

@@ -0,0 +1,24 @@
+.btn.inner
+  %span.left
+    =link_to [:admin,node], :confirm => t('amalgam.admin.confirmation.delete_child', :model => Page.model_name.human), :method => :delete, :title => t('amalgam.admin.actions.destroy'),:remote => true, :class => 'hover',:rel => 'tooltip' do
+      %i.icon-remove
+  %span= node.title
+  %span.right
+    %b.caret
+= form_for([:admin,node],:remote => true,:html => {:data => {:loading => t('amalgam.admin.message.loading'), :done => t('amalgam.admin.message.done'), :error => t('amalgam.admin.message.error')},:class => 'basic'}) do |f|
+  = f.label :path
+  %pre
+    = link_to node.slug , main_app.page_path(node.slug) ,:target => '_blank'
+  = render :partial => 'fields', :locals => {:af => f}
+
+  %p
+    = f.submit :class => 'btn btn-primary'
+    = link_to new_admin_page_path(:parent_id => node.id), :class => 'btn btn-info btn-add', :data => {:toggle => 'button'} ,:title => "#{t('amalgam.admin.actions.new')}#{Page.model_name.human}" do
+      %i.icon-plus.icon-white
+      =t('amalgam.admin.actions.new_child')
+    = link_to main_app.page_path(node.slug,:anchor => 'edit'), :class => 'btn btn-success' do
+      %i.icon-edit.icon-white
+      =t('amalgam.admin.actions.edit_content')
+    = link_to admin_page_path(node) , :class => 'btn btn-danger' ,:method => 'delete',:confirm => t('amalgam.admin.confirmation.delete_child', :model => Page.model_name.human), :remote => true do
+      %i.icon-trash.icon-white
+      = t('amalgam.admin.actions.destroy')

data/app/views/amalgam/admin/pages/create.js.erb

@@ -0,0 +1 @@
+<%= render :partial => 'amalgam/admin/tree/create',:locals =>{ :node => @page } %>

data/app/views/amalgam/admin/pages/destroy.js.erb

@@ -0,0 +1 @@
+<%= render :partial => 'amalgam/admin/tree/destroy', :locals => {:node => @page} %>

data/app/views/amalgam/admin/pages/edit.html.haml

@@ -0,0 +1,2 @@
+%article
+	=render :partial => 'form' , :locals => {:title => "#{t('amalgam.admin.actions.edit')}#{Page.model_name.human}"}

data/app/views/amalgam/admin/pages/index.html.haml

@@ -0,0 +1,6 @@
+%header.clearfix{'data-scroll' => 'fixed'}
+  = link_to new_admin_page_path, :class => 'btn btn-info btn-add', :data => {:toggle => 'button'} ,:title => "#{t('amalgam.admin.actions.new')}#{Page.model_name.human}" do
+    %i.icon-plus.icon-white
+    #{t('amalgam.admin.actions.new')}#{Page.model_name.human}
+
+=render :partial => "amalgam/admin/tree/list", :locals =>{ :collection => @pages, :parent_id => nil , :data => {:done => t('amalgam.admin.tree.moved'), :error => t('amalgam.admin.tree.move_error') ,:path => admin_pages_path, :param => Page.model_name.underscore} }

data/app/views/amalgam/admin/pages/new.html.haml

@@ -0,0 +1,2 @@
+%article
+	=render :partial => 'form' , :locals => {:title => "#{t('amalgam.admin.actions.new')}#{Page.model_name.human}"}

data/app/views/amalgam/admin/pages/update.js.erb

@@ -0,0 +1 @@
+<%= render :partial => 'amalgam/admin/tree/update', :locals => {:node => @page} %>

data/app/views/amalgam/admin/tree/_create.js.erb

@@ -0,0 +1,19 @@
+(function($){
+<% if node.errors.empty? -%>
+		<%- if selector = node.parent_id.present? -%>
+			var $el = $('.tree li[data-id=<%= node.parent_id %>]');
+			var	$ol = $el.children('ol')
+			if(!$ol.length)$ol = $('<ol/>').appendTo($el);
+		<%- else -%>
+			var	$ol = $('div > .tree');
+		<%- end -%>
+		var node = $('<%=j render(:partial => 'amalgam/admin/tree/node', :locals => {:node => node, :collection => node.self_and_descendants}) %>').appendTo($ol);
+		node.scrollintoview({
+			duration:500,
+		}).hide();
+		setTimeout(function(){node.slideDown()},0)
+<% else -%>
+		setTimeout(function(){App.error('<%=j(node.errors.full_messages.join(',')) %>')},1600);
+		console.log(<%= node.errors.full_messages.inspect %>)
+<% end -%>
+})(window.jQuery)

data/app/views/amalgam/admin/tree/_destroy.js.erb

@@ -0,0 +1,6 @@
+(function($){
+	var el = $('.tree [data-id=<%= node.id %>]');
+	el.slideUp((function(){
+		el.remove();
+	}))
+})(window.jQuery)

data/app/views/amalgam/admin/tree/_list.html.haml

@@ -0,0 +1,5 @@
+- nodes = collection.select{|item| item.parent_id == parent_id}.sort_by{|u| u.lft}
+- if nodes.present?
+  %ol.tree{:data => local_assigns[:data]}
+    - nodes.each do |node|
+      =render :partial => "amalgam/admin/tree/node", :locals =>{ :node => node, :collection => collection }

data/app/views/amalgam/admin/tree/_node.html.haml

@@ -0,0 +1,3 @@
+%li.clearfix{:data => { :id => node.id }, :id => "node-#{node.id}"}
+  = render :partial => 'tree_inner', :locals => { :node => node }
+  = render :partial => 'amalgam/admin/tree/list', :locals => { :parent_id => node.id , :collection => collection }

data/app/views/amalgam/admin/tree/_update.js.erb

@@ -0,0 +1,11 @@
+(function($){
+	var $el = $('.tree [data-id=<%= node.id %>]');
+<% if node.errors.empty? -%>
+	var state = $el.find('form').is(':visible');
+	$el.html($('<%=j render(:partial => 'amalgam/admin/tree/node', :locals => {:node => node, :collection => node.self_and_descendants}) %>').html());
+	if(state)
+		$('.tree [data-id=<%= node.id %>] > form').show();
+<% else -%>
+	 $('<div class="alert alert-error"><%=j(node.errors.full_messages.join(',')) %><a href="#" data-dismiss="alert" class="close">×</a></div>').hide().prependTo($el.children('form')).fadeIn();
+<% end -%>
+})(window.jQuery)

data/app/views/amalgam/registrations/edit.html.haml

@@ -0,0 +1,28 @@
+%article.registration
+  = form_for(@resource, :url => amalgam.send("#{params['resource'] || resource_name}_edit_info_path")) do |f|
+    %legend="#{t('amalgam.admin.actions.edit')}#{(params['resource'] || resource_name).to_s.classify.safe_constantize.model_name.human}"
+
+    .input
+      = f.label :username
+      = f.text_field :username, :autofocus => true
+
+    .input
+      = f.label :email
+      = f.email_field :email
+
+    .input
+      = f.label :password
+      = f.password_field :password, :autocomplete => "off", :placeholder => t("amalgam.registrations.leaveblank")
+
+    .input
+      = f.label :password_confirmation
+      = f.password_field :password_confirmation
+
+    .input
+      = f.label :current_password
+      = f.password_field :current_password, :placeholder => t("amalgam.registrations.currentpassword")
+
+    %hr
+    %p
+      = f.submit t('amalgam.admin.actions.update'), :class => "btn btn-primary"
+      = link_to t('amalgam.admin.a.back'), :back, :class => "btn"