interview 0.0.6 → 0.0.7

data/lib/generators/interview/install/templates/bootstrap_interview.css.scss

@@ -4,6 +4,11 @@
 
 $navbar-default-brand-color: $brand-primary;
 $navbar-default-bg: $brand-primary-lighten;
+$navbar-inverse-brand-color: $brand-primary-lighten;
+$navbar-inverse-bg: $brand-primary;
+$navbar-inverse-color: #ffffff;
+$navbar-inverse-link-color: $brand-primary-lighten;
+$navbar-inverse-link-hover-color: #ffffff;
 
 @import 'bootstrap';
 
@@ -95,4 +100,27 @@ $nav-stacked-link-padding-level2: 5px 15px 5px 45px !default;
   input {
     width: auto;
   }
+}
+
+.inline-block {
+  display: inline-block;
+  /* IE 7 hack */
+  *zoom:1;
+  *display: inline;
+  vertical-align: middle;
+  margin-right: 10px;
+}
+
+.list-item {
+  margin-top: 15px;
+}
+
+.img-thumb {
+  display: inline-block;
+  /* IE 7 hack */
+  *zoom:1;
+  *display: inline;
+  vertical-align: middle;
+  margin-right: 5px;
+  margin-bottom: 5px;
 }

data/lib/generators/interview/install/templates/interview.js.coffee

@@ -42,7 +42,7 @@ jQuery ->
     e.preventDefault()
     object_class = $('#add_link_class').children('option:selected').val()
     if object_class != ''
-      location.href = "#{$(this).attr('href')}?type=#{object_class}"
+      location.href = "#{$(this).attr('href')}?filter%5Btype%5D=#{object_class}"
       
   $('.jstree').each ->
     params =
@@ -69,4 +69,62 @@ jQuery ->
             "position": data.position
           error: (data) ->
             tree.jstree('refresh')
-            $(tree).before("<div class=\"alert alert-danger\">#{data.responseText}</div>")
+            $(tree).before("<div class=\"alert alert-danger\">#{data.responseText}</div>")
+            
+  $('.collapse_link').click (e) -> 
+    e.preventDefault()
+    $($(this).data('target')).collapse('toggle')
+  
+  $('.img-link').click (e) ->
+    links = $('.img-link')
+    target = event.target || event.srcElement
+    link = if target.src then target.parentNode else target
+    options = { index: link, event: e }
+    blueimp.Gallery(links, options)
+
+  $('.image-upload').fileupload
+    add: (e, data) ->
+      types = /(\.|\/)(gif|jpe?g|png|mov|mpeg|mpeg4|avi)$/i
+      file = data.files[0]
+      if types.test(file.type) || types.test(file.name)
+        data.context = $(tmpl("upload-progress-script", file))
+        $('#upload-progress').append($(data.context))
+
+        $("input[name='_method']").attr('name', 'method')
+        data.submit()
+        $("input[name='method']").attr('name', '_method')
+      else
+        alert("#{file.name} is not a gif, jpg or png image file")
+    progress: (e, data) ->
+      if data.context
+        progress = parseInt(data.loaded / data.total * 100, 10)
+        data.context.find('.bar').css('width', progress + '%')
+    done: (e, data) ->
+      $('#image-tag').attr('src', data.result.thumb_url)
+      # context = $(tmpl("image-thumb-script", data.result))
+      # $('#image-gallery').append($(context))
+      $('.image-id').attr('value', data.result.id)
+
+  $('.multiple-image-upload').fileupload
+    add: (e, data) ->
+      types = /(\.|\/)(gif|jpe?g|png|mov|mpeg|mpeg4|avi)$/i
+      file = data.files[0]
+      if types.test(file.type) || types.test(file.name)
+        data.context = $(tmpl("upload-progress-script", file))
+        $('#upload-progress').append($(data.context))
+
+        $("input[name='_method']").attr('name', 'method')
+        data.submit()
+        $("input[name='method']").attr('name', '_method')
+      else
+        alert("#{file.name} is not a gif, jpg or png image file")
+    progress: (e, data) ->
+      if data.context
+        progress = parseInt(data.loaded / data.total * 100, 10)
+        data.context.find('.bar').css('width', progress + '%')
+    done: (e, data) ->
+      context = $(tmpl("image-thumb-script", data.result))
+      $('#image-gallery').append($(context))
+      ids = JSON.parse($('.image-ids').attr('value'))
+      ids.push data.result.id
+      $('.image-ids').attr('value', JSON.stringify(ids))

data/lib/interview/association_attribute.rb

@@ -6,13 +6,10 @@ module Interview
     def render_read
       return '' if value.nil?
       assoc_object = value
-      if h.respond_to? "#{@method}_path"
-        return Link.new(parent: self,
-                        caption: "#{assoc_object.human_id}",
-                        object: assoc_object).render
-      else
-        return assoc_object.human_id
-      end
+      # todo: Link nicht anzeigen, wenn Route für Objekt nicht existiert
+      return Link.new(parent: self,
+                      caption: "#{assoc_object.human_id}",
+                      object: assoc_object).render
     end
     
     def render_write
@@ -26,7 +23,8 @@ module Interview
         assoc_class = object.class.new.send("build_#{@method}").class
         pool = assoc_class.all
       end
-      form_builder.collection_select "#{@method}_id", pool, :id, :human_id, {prompt: true}, {class: 'form-control'}
+      form_builder.collection_select "#{@method}_id", pool, :id, :human_id, {include_blank: true}, {class: 'form-control'}
+      # todo: prompt einbauen
     end
     
   end

data/lib/interview/association_list_attribute.rb

@@ -1,7 +1,7 @@
 module Interview
   class AssociationListAttribute < Attribute
     
-    attr_accessor :use
+    attr_accessor :use, :size
     
     def render_read
       return '' if value.nil?
@@ -17,6 +17,7 @@ module Interview
     end
     
     def render_write
+      size = @size || 8
       if @use == 'multi_select'
         object = find_attribute!(:object)
         if object.respond_to? "#{method.singularize}_pool"
@@ -25,7 +26,7 @@ module Interview
           assoc_class = object.class.new.send(@method).build.class
           pool = assoc_class.all
         end
-        form_builder.collection_select "#{@method.singularize}_ids", pool, :id, :human_id, {prompt: true}, {class: 'form-control', multiple: true}
+        form_builder.collection_select "#{@method.singularize}_ids", pool, :id, :human_id, {prompt: true}, {class: 'form-control', multiple: true, size: size}
         # form_builder.collection_select "#{@method.singularize}_ids", Category.all.collect {|x| [x.name, x.id]}, {}, :multiple => true
       else
         return form_builder.text_field "#{@method}_human_ids_string", class: 'form-control'

data/lib/interview/attribute.rb

@@ -2,10 +2,15 @@ module Interview
   class Attribute < Control
     
     attr_accessor :method, :caption, :style, :link, :nil_value, :hide_caption, :hide_tooltip,
-      :only_for, :align, :on_changed
+      :only_for, :align, :on_changed, :html_class, :surrounding_tag
+    
+    def initialize(params={})
+      @html_class = []
+      super
+    end
     
     def value
-      object = find_attribute! :object
+      object = @object || find_attribute!(:object)
       if object.respond_to? @method
         val = object.send @method
       end
@@ -18,14 +23,13 @@ module Interview
         return @caption
       else
         object = find_attribute! :object
-        puts "#{object.class.name} #{@method}"
         return object.class.human_attribute_name(@method)
       end
     end
     
     def tooltip
       object = find_attribute! :object
-      return h.t("activerecord.tooltips.#{object.class.name.underscore}.attributes.#{@method}", default: '')
+      return h.t("activerecord.attribute_tooltips.#{object.class.model_name.i18n_key}.#{@method}", default: '')
     end
     
     
@@ -33,10 +37,11 @@ module Interview
       return '' if hide?
       
       if @style and respond_to?("render_#{@style}_style", true)
-        return send("render_#{@style}_style")
+        html = send("render_#{@style}_style")
       else
-        return render_default_style
+        html = render_default_style
       end
+      return add_surrounding_tag(html)
     end
     
     def render_read
@@ -74,45 +79,62 @@ module Interview
       object = find_attribute! :object
       align = @align || find_attribute(:align)
       
-      html = Builder::XmlMarkup.new
-      html.div class: "form-group" do # todo: old class: "form-group attribute_#{@method.to_s} collapse in"
-        opts = {}
-        opts[:class] = 'col-xs-3 control-label' if align == 'horizontal'
-        opts[:class] = 'sr-only' if align == 'inline'
-        if @hide_caption
-          html.div opts
-        else
-          html << form_builder.label(@method, opts) do
-            form_html = Builder::XmlMarkup.new
-            form_html.text! caption
-            # if not @hide_tooltip and tooltip != ''
-            #   form_html.text! ' '
-            #   form_html << Tooltip.new(tooltip: tooltip, style: :popover).render
-            # end
-            form_html.target!.html_safe
-          end
-        end
+      html = Builder::XmlMarkup.new(indent: 2)
+      html.div class: 'form-group' do
+        
+        html.div class: 'col-xs-3' if @hide_caption and align == 'horizontal'
+        render_form_label(html)
+        
         if align == 'horizontal'
           html.div class: 'col-xs-9' do
             html << render_write
-            if not @hide_tooltip and tooltip != ''
-              html.p tooltip, class: 'help-block'
-            end
+            render_form_tooltip(html)
           end
         else
           html << render_write
-          if not @hide_tooltip and tooltip != ''
-            html.p tooltip, class: 'help-block'
-          end
+          render_form_tooltip(html)
         end
+        
       end
       return html.target!
     end
     
+    def render_form_label(html)
+      align = @align || find_attribute(:align)
+      html_opts = if @hide_caption or align == 'inline'
+        { class: 'sr-only' }
+      elsif align == 'horizontal'
+        { class: 'col-xs-3 control-label' }
+      else
+        {}
+      end
+      html << form_builder.label(@method, html_opts) do
+        form_html = Builder::XmlMarkup.new
+        form_html.text! caption
+        form_html.target!.html_safe
+      end
+    end
+    
+    def render_form_tooltip(html)
+      if not @hide_tooltip and tooltip != ''
+        html.p tooltip, class: 'help-block'
+      end
+    end
+    
     def form_builder
       return find_attribute! :form_builder
     end
     
+    def add_surrounding_tag(html)
+      if @surrounding_tag
+        opts = {}
+        opts[:class] = @html_class.join(' ') unless @html_class.empty?
+        return h.content_tag @surrounding_tag.to_sym, html, opts
+      else
+        return html
+      end
+    end
+    
     def add_link(value)
       if @link
         return Link.new(parent: @parent, caption: value.to_s).render

data/lib/interview/collapse_container.rb

@@ -0,0 +1,20 @@
+module Interview
+  class CollapseContainer < Control
+    include HasControls
+    
+    attr_accessor :caption
+        
+    def render
+      html = Builder::XmlMarkup.new
+      new_id = Time.now.to_f.to_s.delete('.')
+      html << h.link_to(@caption, '#', class: 'collapse_link', data: { toggle: 'collapse', target: "##{new_id}" })
+      html.div id: new_id, class: 'panel-collapse collapse' do
+        @controls.each do |control|
+          html << control.render
+        end
+      end
+      return html.target!
+    end
+    
+  end
+end

data/lib/interview/condition_container.rb

@@ -0,0 +1,19 @@
+module Interview
+  class ConditionContainer < Control
+    include HasControls
+    
+    attr_accessor :condition
+    
+    def render
+      object = find_attribute :object
+      if @condition.call(object)
+        return @controls.map do |control|
+          control.render
+        end.join
+      else
+        return ''
+      end
+    end
+    
+  end
+end

data/lib/interview/dropdown.rb

@@ -2,13 +2,25 @@ module Interview
   class Dropdown < Control
     include HasControls
     
-    attr_accessor :caption, :align
+    attr_accessor :image, :caption, :style, :html_class
+    
+    def initialize(params={})
+      @html_class = []
+      super
+    end
     
     def render
       html = Builder::XmlMarkup.new
-      html.div class: 'dropdown' do
-        html.a class: 'dropdown-toggle btn btn-default', href: '#', :'data-toggle' => 'dropdown' do
-          html.text! @caption + ' '
+      html_class = @html_class.dup
+      html_class << 'dropdown'
+      html.div class: html_class.join(' ') do
+        html_class = 'dropdown-toggle'
+        html_class += ' btn btn-default' if @style == 'button'
+        html.a class: html_class, href: '#', :'data-toggle' => 'dropdown' do
+          html.span '', class: "glyphicon glyphicon-#{@image}" if @image
+          html.text! ' ' if @image and @caption
+          html.text! @caption if @caption
+          html.text! ' ' if @caption
           html.span '', class: 'caret'
         end
         html.ul class: 'dropdown-menu' do

data/lib/interview/form.rb

@@ -5,64 +5,59 @@ module Interview
     attr_accessor :skip_submit, :multi_create, :align, :redirect_to
     attr_reader :form_builder
     
-    def attribute_modus
-      return :write
-    end
-    
-    def render # todo: Aufräumen
+    def render
       object = find_attribute!(:object)
-      model = object.class.lookup_ancestors.last.model_name.singular # todo
-      # if object.class.superclass.name == 'ActiveRecord::Base'
-      #   model = object.class.name.underscore
-      # else
-      #   model = object.class.superclass.name.underscore
-      # end
-      if object.id
-        url = h.send("#{model}_path", object)
-      else
-        url = h.send("#{model.pluralize}_path")
+      html_options = case @align
+        when 'horizontal' then { class: 'form-horizontal' }
+        when 'inline' then { class: 'form-inline' }
+        else {}
       end
-      opts = {as: model.to_sym, url: url, role: 'form', html: {}}
-      opts[:html][:class] = 'form-horizontal' if @align == 'horizontal'
-      opts[:html][:class] = 'form-inline' if @align == 'inline'
-      html = Builder::XmlMarkup.new
-      html << h.form_for(object, opts) do |form_builder|
+      return h.form_for(object, role: 'form', html: html_options) do |form_builder|
         @form_builder = form_builder
-        form_html = Builder::XmlMarkup.new
-        form_html << FormErrors.new(parent: self).render
-        if @redirect_to == :parent and Object.const_defined? 'Gretel'
-          form_html << h.hidden_field_tag('redirect_to', h.parent_breadcrumb.url)
-        end
+        html = Builder::XmlMarkup.new(indent: 2)
+        
+        render_default_controls(html)
         
         @controls.each do |control|
-          form_html << control.render
-          form_html.text! ' ' if @align == 'inline'
+          html << control.render
+          html.text! ' ' if @align == 'inline'
         end
         
-        if not @skip_submit
-          if @align == 'horizontal'
-            form_html.div class: 'form-group' do
-              form_html.div class: 'col-sm-offset-3 col-sm-9' do
-                form_html << form_builder.submit(class: 'btn btn-primary')
-                if @multi_create || find_attribute(:multi_create)
-                  form_html.text! ' '
-                  form_html << h.check_box_tag('new_record', '1', true)
-                  form_html.text! ' und weiteren Datesatz'
-                end
-              end
-            end
-          else
-            form_html << form_builder.submit(class: 'btn btn-primary')
-            if @multi_create || find_attribute(:multi_create)
-              form_html.text! ' '
-              form_html << h.check_box_tag('new_record', '1', true)
-              form_html.text! ' und weiteren Datesatz'
+        if @align == 'horizontal'
+          html.div class: 'form-group' do
+            html.div class: 'col-sm-offset-3 col-sm-9' do
+              render_submit(html)
             end
           end
+        else
+          render_submit(html)
+        end
+        
+        html.target!.html_safe
+      end
+    end
+    
+    protected
+    
+    def render_submit(html)
+      if not @skip_submit
+        html << form_builder.submit(class: 'btn btn-primary')
+        if @multi_create || find_attribute(:multi_create)
+          html.text! ' '
+          html << h.check_box_tag('new_record', '1', true)
+          html.text! ' und weiteren Datesatz' # todo
         end
-        form_html.target!.html_safe
       end
-      return html.target!
+    end
+    
+    def render_default_controls(html)
+      html << FormErrors.new(parent: self).render
+      
+      if @redirect_to == :parent and Object.const_defined? 'Gretel'
+        html << h.hidden_field_tag('redirect_to', h.parent_breadcrumb.url)
+      elsif @redirect_to == :current
+        html << h.hidden_field_tag('redirect_to', h.request.original_url)
+      end
     end
     
   end

data/lib/interview/form_errors.rb

@@ -6,8 +6,8 @@ module Interview
       
       html = Builder::XmlMarkup.new
       if object.errors.any?
-        html.div class: 'error_explanation!' do
-          html.h2 "#{pluralize(object.errors.count, 'error')} prohibited this article from being saved:"
+        html.div class: 'alert alert-danger' do
+          html.h4 h.translate("errors.template.header", count: object.errors.count, model: object.class.model_name.human)
           html.ul do
             object.errors.full_messages.each do |msg|
               html.li msg

data/lib/interview/grid.rb

@@ -44,7 +44,7 @@ module Interview
         end  
       end
       if objects.empty?
-        html.p "Keine #{@object.class.model_name.human(count: 2)} vorhanden.", class: 'text-center text-muted'
+        html.p "Keine #{@object.class.human_name(count: 2)} vorhanden.", class: 'text-center text-muted'
       end
       return html.target!
     end

data/lib/interview/image_attribute.rb

@@ -1,32 +1,72 @@
 module Interview
   class ImageAttribute < Attribute
     
-    attr_accessor :image_style, :hide_if_not_exists
+    # - Bild muss in eingener Klasse ausgelagert werden
+    # - object muss die Methode method_id= implementieren
+    # - method_id muss als parameter erlaubt werden
+    # - json ansicht auf bild muss vorhanden sein
+    
+    attr_accessor :object, :submethod, :image_style, :hide_if_not_exists
     
     def render_read
-      return '' if value.nil?
+      submethod = @submethod || 'attachment'
       image_style = @image_style || :thumb
-      if not value.exists? and @hide_if_not_exists
-        return ''
-      else
-        return h.image_tag value.url(image_style)
+      object = @object || find_attribute(:object)
+      image = value || object.association(@method).build
+      
+      attachment = image.send(submethod)
+      return '' if not attachment.exists? and @hide_if_not_exists
+      
+      html = Builder::XmlMarkup.new
+      opts = {class: "image_#{image_style}"}
+      opts[:class] += ' ' + @html_class.join(' ') unless @html_class.empty? or @surrounding_tag
+      html.div opts do
+        html << h.image_tag(attachment.url(image_style), class: 'img-responsive')
       end
+      return html.target!
     end
     
     def render_write
-      object = find_attribute(:object)
-      image = object.send @method
+      object = @object || find_attribute(:object)
+      submethod = @submethod || 'attachment'
+      image_style = @image_style || :thumb
+      image = object.send(@method) || object.association(@method).build
+      attachment = image.send(submethod)
+      model = image.class.model_name.singular
       
       html = Builder::XmlMarkup.new
-      if image.exists? and @image_style
-        html.br
-        html << h.image_tag(image.url(@image_style))
+      
+      html << form_builder.hidden_field("#{@method.singularize}_id", class: 'image-id')
+      
+      html.div class: 'inline-block' do
+        html << h.image_tag(attachment.url(image_style), id: 'image-tag')
       end
-      html << form_builder.file_field(@method)
-      if image.exists?
-        html << form_builder.check_box("destroy_#{@method}")
-        html.text! ' Datei löschen'
+      
+      html.div class: 'inline-block' do
+        html.span class: "btn btn-default fileinput-button" do
+          html.span "Select file..."
+          html << h.file_field_tag("#{model}[#{submethod}]", class: 'image-upload', 
+            data: {url: "/#{model.pluralize}.json", type: 'POST'})
+        end
+      
+        # if attachment.exists?
+        #   html << form_builder.check_box("destroy_#{@method}")
+        #   html.text! ' Datei löschen'
+        # end
+      end
+      
+      html.div id: 'upload-progress' do
       end
+      
+      html.script id: 'upload-progress-script', type: 'text/x-tmpl' do
+        html.div class: 'upload' do
+          html.text! "{%=o.name%}"
+          html.div class: 'progress' do
+            html.div '', class: 'progress-bar bar', style: 'width: 0%'
+          end
+        end
+      end
+      
       return html.target!
     end
     

data/lib/interview/image_gallery_attribute.rb

@@ -0,0 +1,74 @@
+module Interview
+  class ImageGalleryAttribute < Attribute
+    
+    attr_accessor :object, :submethod, :image_style, :light_box_image_style
+    
+    def render_read
+      submethod = @submethod || 'attachment'
+      image_style = @image_style || :thumb
+      images = value
+      
+      html = Builder::XmlMarkup.new
+      render_gallery(html, images, submethod, image_style, @light_box_image_style)
+      return html.target!
+    end
+    
+    def render_write
+      object = @object || find_attribute(:object)
+      submethod = @submethod || 'attachment'
+      image_style = @image_style || :thumb
+      images = object.send @method
+      model = images.klass.model_name.singular
+      
+      html = Builder::XmlMarkup.new
+      html.div class: 'image-upload-group' do
+      
+        html << form_builder.hidden_field("#{@method.singularize}_ids", class: 'image-ids')
+    
+        render_gallery(html, images, submethod, image_style, @light_box_image_style)
+    
+        light_box_image_url = @light_box_image_style ? "#{@light_box_image_style}_url" : 'url'
+        html.script id: 'image-thumb-script', type: 'text/x-tmpl' do
+          html.a href: "{%=o.#{light_box_image_url}%}", class: 'img-link' do
+            html.img class: 'img-thumb', src: "{%=o.thumb_url%}"
+          end
+        end
+    
+        html.div class: "clearfix" do
+          html.span class: "btn btn-default fileinput-button" do
+            html.span "Bilder hinzufügen" # todo
+            html << h.file_field_tag("#{model}[#{submethod}]", class: 'multiple-image-upload', multiple: true,
+              data: {url: "/#{model.pluralize}.json", type: 'POST'})
+          end
+        end
+    
+        html.div class: 'upload-progress' do
+        end
+    
+        html.script id: 'upload-progress-script', type: 'text/x-tmpl' do
+          html.div class: 'upload' do
+            html.text! "{%=o.name%}"
+            html.div class: 'progress' do
+              html.div '', class: 'progress-bar bar', style: 'width: 0%'
+            end
+          end
+        end
+      end
+      
+      return html.target!
+    end
+    
+    protected
+    
+    def render_gallery(html, images, submethod, image_style, light_box_image_style)
+      html.div class: 'image-gallery' do
+        images.each do |image|
+          html.a href: image.send(submethod).url(light_box_image_style), class: 'img-link' do
+            html << h.image_tag(image.send(submethod).url(image_style), class: 'img-thumb')
+          end
+        end
+      end
+    end
+    
+  end
+end