spiderfw 0.6.30 → 0.6.31

data/apps/core/components/public/bootstrap_3/scss/mixins/_opacity.scss

@@ -0,0 +1,8 @@
+// Opacity
+
+@mixin opacity($opacity) {
+  opacity: $opacity;
+  // IE8 filter
+  $opacity-ie: ($opacity * 100);
+  filter: #{alpha(opacity=$opacity-ie)};
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_pagination.scss

@@ -0,0 +1,23 @@
+// Pagination
+
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+  > li {
+    > a,
+    > span {
+      padding: $padding-vertical $padding-horizontal;
+      font-size: $font-size;
+    }
+    &:first-child {
+      > a,
+      > span {
+        @include border-left-radius($border-radius);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius);
+      }
+    }
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_panels.scss

@@ -0,0 +1,20 @@
+// Panels
+
+@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
+  border-color: $border;
+
+  & > .panel-heading {
+    color: $heading-text-color;
+    background-color: $heading-bg-color;
+    border-color: $heading-border;
+
+    + .panel-collapse > .panel-body {
+      border-top-color: $border;
+    }
+  }
+  & > .panel-footer {
+    + .panel-collapse > .panel-body {
+      border-bottom-color: $border;
+    }
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_progress-bar.scss

@@ -0,0 +1,8 @@
+// Progress bars
+
+@mixin progress-bar-variant($color) {
+  background-color: $color;
+  .progress-striped & {
+    @include gradient-striped();
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_reset-filter.scss

@@ -0,0 +1,8 @@
+// Reset filters for IE
+//
+// When you need to remove a gradient background, do not forget to use this to reset
+// the IE filter for IE9 and below.
+
+@mixin reset-filter() {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_resize.scss

@@ -0,0 +1,6 @@
+// Resize anything
+
+@mixin resizable($direction) {
+  resize: $direction; // Options: horizontal, vertical, both
+  overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_responsive-visibility.scss

@@ -0,0 +1,21 @@
+// Responsive utilities
+
+//
+// More easily include all the states for responsive-utilities.less.
+// [converter] $parent hack
+@mixin responsive-visibility($parent) {
+  #{$parent} {
+    display: block !important;
+  }
+  table#{$parent}  { display: table; }
+  tr#{$parent}     { display: table-row !important; }
+  th#{$parent},
+  td#{$parent}     { display: table-cell !important; }
+}
+
+// [converter] $parent hack
+@mixin responsive-invisibility($parent) {
+  #{$parent} {
+    display: none !important;
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_size.scss

@@ -0,0 +1,10 @@
+// Sizing shortcuts
+
+@mixin size($width, $height) {
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size) {
+  @include size($size, $size);
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_tab-focus.scss

@@ -0,0 +1,9 @@
+// WebKit-style focus
+
+@mixin tab-focus() {
+  // Default
+  outline: thin dotted;
+  // WebKit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_table-row.scss

@@ -0,0 +1,28 @@
+// Tables
+
+@mixin table-row-variant($state, $background) {
+  // Exact selectors below required to override `.table-striped` and prevent
+  // inheritance to nested tables.
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.#{$state},
+    > th.#{$state},
+    &.#{$state} > td,
+    &.#{$state} > th {
+      background-color: $background;
+    }
+  }
+
+  // Hover states for `.table-hover`
+  // Note: this is not available for cells or rows within `thead` or `tfoot`.
+  .table-hover > tbody > tr {
+    > td.#{$state}:hover,
+    > th.#{$state}:hover,
+    &.#{$state}:hover > td,
+    &:hover > .#{$state},
+    &.#{$state}:hover > th {
+      background-color: darken($background, 5%);
+    }
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_text-emphasis.scss

@@ -0,0 +1,11 @@
+// Typography
+
+// [converter] $parent hack
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent} {
+    color: $color;
+  }
+  a#{$parent}:hover {
+    color: darken($color, 10%);
+  }
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_text-overflow.scss

@@ -0,0 +1,8 @@
+// Text overflow
+// Requires inline-block or block for proper styling
+
+@mixin text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

data/apps/core/components/public/bootstrap_3/scss/mixins/_vendor-prefixes.scss

@@ -0,0 +1,224 @@
+// Vendor Prefixes
+//
+// All vendor mixins are deprecated as of v3.2 due to the introduction of
+// Autoprefixer in our Gruntfile. They will be removed in v4.
+
+// - Animations
+// - Backface visibility
+// - Box shadow
+// - Box sizing
+// - Content columns
+// - Hyphens
+// - Placeholder text
+// - Transformations
+// - Transitions
+// - User Select
+
+
+// Animations
+@mixin animation($animation) {
+  -webkit-animation: $animation;
+       -o-animation: $animation;
+          animation: $animation;
+}
+@mixin animation-name($name) {
+  -webkit-animation-name: $name;
+          animation-name: $name;
+}
+@mixin animation-duration($duration) {
+  -webkit-animation-duration: $duration;
+          animation-duration: $duration;
+}
+@mixin animation-timing-function($timing-function) {
+  -webkit-animation-timing-function: $timing-function;
+          animation-timing-function: $timing-function;
+}
+@mixin animation-delay($delay) {
+  -webkit-animation-delay: $delay;
+          animation-delay: $delay;
+}
+@mixin animation-iteration-count($iteration-count) {
+  -webkit-animation-iteration-count: $iteration-count;
+          animation-iteration-count: $iteration-count;
+}
+@mixin animation-direction($direction) {
+  -webkit-animation-direction: $direction;
+          animation-direction: $direction;
+}
+@mixin animation-fill-mode($fill-mode) {
+  -webkit-animation-fill-mode: $fill-mode;
+          animation-fill-mode: $fill-mode;
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden`
+
+@mixin backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+          backface-visibility: $visibility;
+}
+
+// Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+// supported browsers that have box shadow capabilities now support it.
+
+@mixin box-shadow($shadow...) {
+  -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
+          box-shadow: $shadow;
+}
+
+// Box sizing
+@mixin box-sizing($boxmodel) {
+  -webkit-box-sizing: $boxmodel;
+     -moz-box-sizing: $boxmodel;
+          box-sizing: $boxmodel;
+}
+
+// CSS3 Content Columns
+@mixin content-columns($column-count, $column-gap: $grid-gutter-width) {
+  -webkit-column-count: $column-count;
+     -moz-column-count: $column-count;
+          column-count: $column-count;
+  -webkit-column-gap: $column-gap;
+     -moz-column-gap: $column-gap;
+          column-gap: $column-gap;
+}
+
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode; // IE10+
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
+// Placeholder text
+@mixin placeholder($color: $input-color-placeholder) {
+  &::-moz-placeholder           { color: $color;   // Firefox
+                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
+  &:-ms-input-placeholder       { color: $color; } // Internet Explorer 10+
+  &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
+}
+
+// Transformations
+@mixin scale($ratio...) {
+  -webkit-transform: scale($ratio);
+      -ms-transform: scale($ratio); // IE9 only
+       -o-transform: scale($ratio);
+          transform: scale($ratio);
+}
+@mixin scale($ratioX, $ratioY...) {
+  -webkit-transform: scale($ratioX, $ratioY);
+      -ms-transform: scale($ratioX, $ratioY); // IE9 only
+       -o-transform: scale($ratioX, $ratioY);
+          transform: scale($ratioX, $ratioY);
+}
+@mixin scaleX($ratio) {
+  -webkit-transform: scaleX($ratio);
+      -ms-transform: scaleX($ratio); // IE9 only
+       -o-transform: scaleX($ratio);
+          transform: scaleX($ratio);
+}
+@mixin scaleY($ratio) {
+  -webkit-transform: scaleY($ratio);
+      -ms-transform: scaleY($ratio); // IE9 only
+       -o-transform: scaleY($ratio);
+          transform: scaleY($ratio);
+}
+@mixin skew($x, $y) {
+  -webkit-transform: skew($x, $y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
+       -o-transform: skew($x, $y);
+          transform: skew($x, $y);
+}
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+      -ms-transform: translate($x, $y); // IE9 only
+       -o-transform: translate($x, $y);
+          transform: translate($x, $y);
+}
+@mixin translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+          transform: translate3d($x, $y, $z);
+}
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees); // IE9 only
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
+}
+@mixin rotateX($degrees) {
+  -webkit-transform: rotateX($degrees);
+      -ms-transform: rotateX($degrees); // IE9 only
+       -o-transform: rotateX($degrees);
+          transform: rotateX($degrees);
+}
+@mixin rotateY($degrees) {
+  -webkit-transform: rotateY($degrees);
+      -ms-transform: rotateY($degrees); // IE9 only
+       -o-transform: rotateY($degrees);
+          transform: rotateY($degrees);
+}
+@mixin perspective($perspective) {
+  -webkit-perspective: $perspective;
+     -moz-perspective: $perspective;
+          perspective: $perspective;
+}
+@mixin perspective-origin($perspective) {
+  -webkit-perspective-origin: $perspective;
+     -moz-perspective-origin: $perspective;
+          perspective-origin: $perspective;
+}
+@mixin transform-origin($origin) {
+  -webkit-transform-origin: $origin;
+     -moz-transform-origin: $origin;
+      -ms-transform-origin: $origin; // IE9 only
+          transform-origin: $origin;
+}
+
+
+// Transitions
+
+@mixin transition($transition...) {
+  -webkit-transition: $transition;
+       -o-transition: $transition;
+          transition: $transition;
+}
+@mixin transition-property($transition-property...) {
+  -webkit-transition-property: $transition-property;
+          transition-property: $transition-property;
+}
+@mixin transition-delay($transition-delay) {
+  -webkit-transition-delay: $transition-delay;
+          transition-delay: $transition-delay;
+}
+@mixin transition-duration($transition-duration...) {
+  -webkit-transition-duration: $transition-duration;
+          transition-duration: $transition-duration;
+}
+@mixin transition-timing-function($timing-function) {
+  -webkit-transition-timing-function: $timing-function;
+          transition-timing-function: $timing-function;
+}
+@mixin transition-transform($transition...) {
+  -webkit-transition: -webkit-transform $transition;
+     -moz-transition: -moz-transform $transition;
+       -o-transition: -o-transform $transition;
+          transition: transform $transition;
+}
+
+
+// User select
+// For selecting text on the page
+
+@mixin user-select($select) {
+  -webkit-user-select: $select;
+     -moz-user-select: $select;
+      -ms-user-select: $select; // IE10+
+          user-select: $select;
+}

data/apps/core/components/public/js/jquery/plugins/bsmselect/js/jquery.bsmselect.js

@@ -184,7 +184,7 @@
      */
     selectFirstItem: function() {
       setTimeout(function(){
-        $('option:eq(0)', this.$select[multiple]).attr('selected', 'selected');
+        $('option:eq(0)', this.$select).attr('selected', 'selected');
       }, 1000);
     },
 

data/apps/core/components/widgets/month_calendar/month_calendar.shtml

@@ -4,19 +4,19 @@
     <table class="{ @widget[:css_class] }">
         <thead>
             <tr>
-                <th colspan="7">
+                <th colspan="7" scope="row" id="current_month">
                     <a href="{ @request[:path] }?_w{ @widget[:param_u] }%5Bd%5D={ @prev_link }"><span>&lt;&lt;</span></a>
                     { @current_month_name } { @year }
                     <a href="{ @request[:path] }?_w{ @widget[:param_u] }%5Bd%5D={ @next_link }"><span>&gt;&gt;</span></a>
                 </th>
             </tr>
             <tr>
-                <th sp:each="@week_days |i|">{ @days_short_names[i] }</th>
+                <th scope="col" sp:each="@week_days |i|" id="{ @days_short_names[i] }_{ i }">{ @days_short_names[i] }</th>
             </tr>
         </thead>
         <tbody>
             <tr sp:each="@rows |row|">
-                <td sp:each="row |col|" class="{ col[:classes].join(' ') }">
+                <td sp:each_with_index="row |col, i|"  headers="event_calendar-current_month event_calendar-{ @days_short_names[i+1] }_{ i }" class="{ col[:classes].join(' ') }">
                     { col[:day] }
                 </td>
             </tr>

data/apps/core/components/widgets/table/table.rb

@@ -116,6 +116,8 @@ module Spider; module Components
                 @scene.page = @page
                 @scene.paginate_first = [@page-5, 1].max
                 @scene.paginate = true
+            else
+                @rows.limit = @attributes[:row_limit]
             end
             if @sort_el
                 @sort_el.each do |el|
@@ -177,8 +179,10 @@ module Spider; module Components
                 list = "<ul>"
                 if row[el]
                     row[el][0..2].each{ |sub|
-                        if sub && element.junction? && element.model.attributes[:sub_model] != @model
-                            sub = sub.get(element.attributes[:junction_their_element]) 
+                        #corretto errore, il controllo guardava solo se il sub_model (il modello collegato via junction) era uguale al modello corrente
+                        # <= controlla se è uguale o una sottoclasse
+                        if sub && element.junction? && !(@model <= element.model.attributes[:sub_model])
+                            sub = sub.get(element.attributes[:junction_their_element])
                         end
                         sub_desc = sub.nil? ? '' : sub.to_s
                         sub_desc ||= ''

data/apps/core/components/widgets/table/table.shtml

@@ -16,20 +16,20 @@
                 <tr class="{ (row_i%2==0) ? 'odd' : 'even' }">
                     <td sp:each="@elements |element|">
                         <a sp:if="((!@link_el.blank? && element == @link_el) && @link.blank?)" href="{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }?current_page={ @page }">
-                            { @rows[row_i][element] }
+                            { URI.decode(@rows[row_i][element]) }
                         </a>   
                         <a sp:if="@link_el && element == @link_el && !@link.blank?" href="{ @link }{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }&current_page={ @page }">
-                            { @rows[row_i][element] }
+                            { URI.decode(@rows[row_i][element]) }
                         </a>
                         <span sp:if="element != @link_el" >
-                            { @rows[row_i][element] }
+                            { URI.decode(@rows[row_i][element]) }
                         </span>
                     </td>
                 </tr>
             </tpl:pass>
         </tbody>
     </table>
-    <div sp:if="@pages > 1" class="pagination">
+    <div sp:if="!@pages.blank? && @pages > 1" class="pagination">
         <ul>
             <li sp:if="@page > 1">
                 <a class="prev" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">&larr; _(Previous)</a>

data/apps/core/forms/widgets/form/form.rb

@@ -363,7 +363,7 @@ module Spider; module Forms
                 next unless input.modified?
                 begin
                     if (input.done?)
-                        obj.set(element_name, input.value)
+                        obj.set(element_name, (input.value.respond_to?(:force_encoding) ? input.value.force_encoding('UTF-8') : input.value ) ) 
                     else
                         inputs_done = false
                     end

data/apps/core/forms/widgets/inputs/select/select.rb

@@ -50,7 +50,7 @@ module Spider; module Forms
             end
             @scene.values = {}
             @scene.selected = {}
-            if @model || (@scene.data.is_a?(QuerySet) && @scene.data.autoload?)
+            if @model || (@scene.data.is_a?(Spider::Model::QuerySet) && @scene.data.autoload?)
                 tree_el = nil
                 if attributes[:tree_element]
                     tree_el = @model.elements[attributes[:tree_element]]
@@ -65,12 +65,22 @@ module Spider; module Forms
                     @scene.tree_depth = tree_el.attributes[:tree_depth]
                 end
             end
+
             if @value
-                val = @multiple ? @value : [@value]
+                if @multiple && @value.model.junction? && @value.model != @model 
+                    our_element = @value.model.elements_array.find{ |el| el.type == @model }
+                    val = @value.map{ |obj| obj.get(our_element) }.uniq
+                else
+                    val = @multiple ? @value : [@value]
+                end
+                
                 val.each do |v|
                     @scene.selected[obj_to_key_str(v)] = true
                 end
             end
+
+
+            
             @scene.data.each_index do |i|
                 @scene.values[i] = obj_to_key_str(@scene.data[i])
             end
@@ -79,6 +89,7 @@ module Spider; module Forms
 
         
         def value=(val)
+            
             if val.blank?
                 @value = nil
                 return

data/apps/messenger/lib/backends/mobyt.rb

@@ -1,6 +1,6 @@
 require 'digest/md5'
 require 'net/http'
-require 'iconv'
+require 'iconv' if RUBY_VERSION =~ /1.8/
 
 module Spider::Messenger
 
@@ -8,7 +8,11 @@ module Spider::Messenger
 
             def self.parametri(username,password,to,from,testo,operation="TEXT",udh="")
                   #cambio la codifica per gli accenti e caratteri particolari
-                  testo_codificato = Iconv.conv('ISO-8859-15', 'UTF-8', testo)
+                  if RUBY_VERSION =~ /1.8/
+                    testo_codificato = Iconv.conv('ISO-8859-15', 'UTF-8', testo)
+                  else
+                    testo_codificato = testo.encode('ISO-8859-15', 'UTF-8')
+                  end
                   string_digest = [username, operation, to, from, testo_codificato, password].map{ |val|
                       val.to_s 
                   }.join("")

data/apps/messenger/lib/backends/skebby.rb

@@ -1,6 +1,6 @@
 require 'digest/md5'
 require 'net/http'
-require 'iconv'
+require 'iconv' if RUBY_VERSION =~ /1.8/
 
 module Spider::Messenger
 

data/apps/webdav/controllers/webdav_controller.rb

@@ -1,6 +1,6 @@
 require 'rexml/document'
 require 'webrick/httputils'
-require 'iconv'
+require 'iconv' if RUBY_VERSION =~ /1.8/
 
 module Spider; module WebDAV
     
@@ -806,12 +806,21 @@ module Spider; module WebDAV
         def codeconv_str_fscode2utf(str)
     		return str if @options[:FileSystemCoding] == "UTF-8"
             debug "codeconv str fscode2utf: orig='#{str}'"
-    		begin
-    			ret = Iconv.iconv("UTF-8", @options[:FileSystemCoding], str).first
-    		rescue Iconv::IllegalSequence
-    			warn "code conversion fail! #{@options[:FileSystemCoding]}->UTF-8 str=#{str.dump}"
-    			ret = str
-    		end
+            if RUBY_VERSION =~ /1.8/
+        		begin
+        			ret = Iconv.iconv("UTF-8", @options[:FileSystemCoding], str).first
+        		rescue Iconv::IllegalSequence
+        			warn "code conversion fail! #{@options[:FileSystemCoding]}->UTF-8 str=#{str.dump}"
+        			ret = str
+        		end
+            else
+                begin
+                    ret = str.encode("UTF-8", @options[:FileSystemCoding]).first
+                rescue rescue EncodingError
+                    warn "code conversion fail! #{@options[:FileSystemCoding]}->UTF-8 str=#{str.dump}"
+                    ret = str
+                end
+            end
     		debug "codeconv str fscode2utf: ret='#{ret}'"
     		ret
     	end

data/lib/spiderfw/controller/http_controller.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 require 'spiderfw/controller/spider_controller'
 require 'spiderfw/controller/session/memory_session'
 require 'spiderfw/controller/session/file_session'
@@ -11,7 +13,8 @@ module Spider
         def initialize(request, response, scene=nil)
             response.status = Spider::HTTP::OK
             response.headers = {
-                'Content-Type' => 'text/plain'
+                'Content-Type' => 'text/plain',
+                'Accept-Charset' => 'utf-8'
             }
             @previous_stdout = $stdout
             Thread.current[:stdout] = response.server_output

data/lib/spiderfw/env.rb

@@ -1,6 +1,5 @@
 RUBY_VERSION_PARTS = RUBY_VERSION.split('.')
 ENV['LC_CTYPE'] = 'en_US.UTF-8'
-
 $SPIDER_PATH ||= File.expand_path(File.dirname(__FILE__)+'/../..')
 $SPIDER_PATHS ||= {}
 $SPIDER_PATHS[:core_apps] ||= File.join($SPIDER_PATH, 'apps')

data/lib/spiderfw/http/adapters/rack.rb

@@ -31,7 +31,9 @@ module Spider; module HTTP
 
         def write(msg)
             send_headers unless @headers_sent
-            @w.write(msg)
+            #workaround per ruby 1.9.3, problemi su parte di admin, faccio force encoding a utf8
+	    msg_dup = msg.to_s.dup
+            @w.write(msg_dup.respond_to?(:force_encoding) ? msg_dup.force_encoding('UTF-8') : msg_dup)
         end
 
         def send_headers