spiderfw 0.6.39 → 1.0.0

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

@@ -136,8 +136,15 @@ module Spider; module Components
             if @attributes[:paginate]
                 @scene.pages = (@rows.total_rows.to_f / @attributes[:row_limit]).ceil
                 @scene.paginate_last = [@scene.paginate_first + 9, @scene.pages].min
+                #passo un array con tutte le pagine
+                array_pag = []
+                1.upto(@scene.pages) do |i|
+                    array_pag << i
+                end
+                @scene.array_pag = array_pag
             end
             @scene.columns = @elements.size
+
             super
         end
         

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

@@ -1,7 +1,7 @@
 <div class="{ @widget[:css_class] }">
     <tpl:asset type="js" src="widgets/table.js" />
     <tpl:asset type="css" src="css/table_base.css" />
-    <table sp:if="@rows && @rows.length > 0" class="table-bordered table-striped">
+    <table sp:if="@rows && @rows.length > 0" class="table table-bordered table-striped table-hover row_linked width_auto">
         <thead>
             <tr class="heading_row">
                 <th sp:each="@elements |element|" class="{ @sortable[element] ? 'sortable' : '' }  { (@sorted[element] ? 'sorted-'+@sorted[element].to_s : '') }">
@@ -14,34 +14,45 @@
         <tbody>
             <tpl:pass sp:each_index="@rows |row_i|">
                 <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 }">
-                            { 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 }">
-                            { URI.decode(@rows[row_i][element]) }
-                        </a>
-                        <span sp:if="element != @link_el" >
-                            { URI.decode(@rows[row_i][element]) }
-                        </span>
-                    </td>
+                        <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 }">
+                                { 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 }">
+                                { URI.decode(@rows[row_i][element]) }
+                            </a>
+                            <span sp:if="element != @link_el" >
+                                { URI.decode(@rows[row_i][element]) }
+                            </span>
+                        </td>
                 </tr>
             </tpl:pass>
         </tbody>
     </table>
-    <div sp:if="!@pages.blank? && @pages > 1" class="pagination">
-        <ul>
+    <ul sp:if="!@pages.blank? && @pages > 1" class="pagination">
+        
+        <!-- versione con file po, da ricreare file per traduzioni
             <li sp:if="@page > 1">
                 <a class="prev" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }">&larr; _(Previous)</a>
             </li>
             <li sp:if="@page == 1" class="disabled">
                 <a class="prev disabled">&larr; _(Previous)</a>
             </li>
+        -->
+            <li sp:if="@page > 1">
+                <a class="prev" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ 1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }"> << </a>
+                <a class="page" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }"> < </a>
+            </li>
+            <li sp:if="@page == 1" class="disabled">
+                <a class="prev disabled"> << </a>
+                <a class="page disabled"> < </a>    
+            </li>
+
             <sp:pass sp:if="@paginate_first > 1">
                 <li>
                     <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">1</a>
                 </li>
-                <li class="disabled"><a>...</a></li>
+                <li><a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @paginate_first-1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">...</a></li>
             </sp:pass>
             <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
                 <li sp:if="i != @page">
@@ -54,19 +65,41 @@
                 </li>
             </sp:pass>
             <sp:pass sp:if="@paginate_last < @pages-1">
-                <li class="disabled"> 
-                    <a>...</a>
+                <li> 
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @paginate_last+1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">...</a>
                 </li>
                 <li>
                     <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }" class="page">{ @pages }</a> 
                 </li>
             </sp:pass>
+            <!-- versione con traduzioni
             <li sp:if="@has_more">
                 <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }">_(Next) &rarr;</a>
             </li>
             <li sp:if="!@has_more" class="disabled">
                 <a class="next disabled">_(Next) &rarr;</a>
             </li>
+            -->
+            <li sp:if="@has_more">
+                <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }"> > </a>
+                <a class="next" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }"> >> </a>
+
+            </li>
+            <li sp:if="!@has_more" class="disabled">
+                <a class="disabled"> > </a>
+                <a class="next disabled"> >> </a>
+            </li>
+    </ul>
+    
+    <!-- select con pagine per navigatore -->
+    <div class="btn-group dropup sel_pagine" sp:if="!@page.blank? && @pages > 1">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        Pag <strong>{ @page }</strong> <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu lista_pagine">
+        <li sp:each="@array_pag |pag_corrente|">
+            <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ pag_corrente }{ ( @query.blank? ? nil : '&_w'+@widget[:param]+'[q]='+@query ) }">{ pag_corrente }</a>
+        </li>
         </ul>
     </div>
     <div sp:if="!@rows || @rows.length < 1" class="no_result">

data/apps/core/forms/tags/row.erb

@@ -10,6 +10,6 @@ else
     el_class = @attributes['class'] || ''
 end
 %>
-<div class="control-group <%=el_class%> { (<%=error_condition%>) ? ' error' : '' }{ (<%=required%>) ? ' required' : '' }">
+<div class="control-group <%=el_class%> { (<%=error_condition%>) ? ' error has-error' : '' }{ (<%=required%>) ? ' required' : '' }">
     <%=@content%>
 </div>

data/lib/spiderfw/cmd/cmd.rb

@@ -10,6 +10,7 @@ require 'spiderfw/cmd/commands/model'
 require 'spiderfw/cmd/commands/config'
 require 'spiderfw/cmd/commands/content'
 require 'spiderfw/cmd/commands/app'
+require 'spiderfw/cmd/commands/assets'
 
 module Spider; module CommandLine
 
@@ -57,6 +58,7 @@ module Spider; module CommandLine
             @cmd.add_command(ContentCommand.new)
             @cmd.add_command(AppCommand.new)
             # @cmd.add_command(ScaffoldCommand.new)
+            @cmd.add_command(AssetsCommand.new)
         end
 
         def parse

data/lib/spiderfw/cmd/commands/assets.rb

@@ -0,0 +1,12 @@
+module Spider::CommandLine
+
+    class AssetsCommand < CmdParse::Command
+
+
+        def initialize
+            super('assets', true, true )
+            @short_desc = "Gestisci assets"
+        end
+    end
+
+end

data/lib/spiderfw/controller/mixins/visual.rb

@@ -609,6 +609,7 @@ module Spider; module ControllerMixins
                 layout.asset_set = params[:assets] if params[:assets]
                 layout.no_asset_profiles(*params[:no_asset_profiles]) if params[:no_asset_profiles]
                 layout.only_asset_profiles(params[:only_asset_profiles]) if params[:only_asset_profiles]
+                layout.single_layout = params[:single_layout] if params[:single_layout]
                 layout
             end
 

data/lib/spiderfw/create.rb

@@ -32,7 +32,6 @@ module Spider
             dest_path = path+'/'+name
             source_path = $SPIDER_PATH+'/blueprints/home'
             create(source_path, dest_path)
-            
             begin
                 require 'git'
 

data/lib/spiderfw/i18n/gettext.rb

@@ -34,6 +34,39 @@ module Spider
             FastGettext.text_domain = domain
         end
         
+        def self.update_pofiles(textdomain, files, app_version, options = {})
+            require 'debugger'
+            debugger
+            puts options.inspect if options[:verbose]
+        
+            #write found messages to tmp.pot
+            temp_pot = "tmp.pot"
+            ::GetText::Tools::XGetText.run("-o", temp_pot, *files)
+        
+            #merge tmp.pot and existing pot
+            po_root = options.delete(:po_root) || "po"
+            FileUtils.mkdir_p(po_root)
+            ::GetText::Tools::MsgMerge.run("#{po_root}/#{textdomain}.pot", temp_pot, app_version, options.dup)
+        
+            #update local po-files
+            only_one_language = options.delete(:lang)
+            if only_one_language
+              ::GetText::Tools::MsgMerge.run("#{po_root}/#{only_one_language}/#{textdomain}.po", temp_pot, app_version, options.dup)
+            else
+              Dir.glob("#{po_root}/*/#{textdomain}.po") do |po_file|
+                ::GetText::Tools::MsgMerge.run(po_file, temp_pot, app_version, options.dup)
+              end
+            end
+        
+            File.delete(temp_pot)
+          end
+
+
+
+
+
+
+
     end
     
 end

data/lib/spiderfw/i18n/javascript_parser.rb

@@ -49,7 +49,7 @@ module Spider; module I18n
         end
 
     end
-    
-    ::GetText::RGetText.add_parser(JavascriptParser)
+    #::GetText::RGetText.add_parser(JavascriptParser)
+    ::GetText::Tools::XGetText.add_parser(JavascriptParser)
 
 end; end

data/lib/spiderfw/i18n/shtml_parser.rb

@@ -35,7 +35,7 @@ module Spider; module I18n
         end
 
     end
-    
-    ::GetText::RGetText.add_parser(SHTMLParser)
+    #::GetText::RGetText.add_parser(SHTMLParser)
+    ::GetText::Tools::XGetText.add_parser(SHTMLParser)
 
 end; end

data/lib/spiderfw/model/model.rb

@@ -346,7 +346,7 @@ module Spider
             # @param [String] message The error message
             def initialize(element, value, message)
                 @element = element
-                @message = message
+                @message = message+" (valore: #{value})"
                 @value = value
                 super(message)
             end
@@ -357,6 +357,7 @@ module Spider
                 Spider::GetText.in_domain('spider'){
                     _(@message) % label
                 }
+
             end
             
         end

data/lib/spiderfw/setup/app_manager.rb

@@ -118,6 +118,14 @@ module Spider
             else
                 pack_install(spec, options)
             end
+            #alla fine dell'installazione, se sto installando il portal creo la cartella 'portal' dentro a 'views'
+            if spec.app_id == 'portal'
+                #Spider.output "Copio layout del portale"
+                dest_layout = File.join(Spider.paths[:personalized_views],spec.app_id)
+                source_layout_file = File.join(Spider.paths[:apps],spec.app_id,'views','portal.layout.shtml')
+                FileUtils.mkdir_p(dest_layout)
+                FileUtils.cp(source_layout_file,dest_layout)
+            end
         end
 
         

data/lib/spiderfw/spider.rb

@@ -184,7 +184,13 @@ module Spider
             #nuove cartelle aggiunte
             FileUtils.mkdir_p(Spider.paths[:data])
             FileUtils.mkdir_p(File.join(Spider.paths[:var], 'sessions'))
-
+            #creo le cartelle per i file scss
+            FileUtils.mkdir_p(Spider.paths[:public])
+            FileUtils.mkdir_p(File.join(Spider.paths[:public],'sass')) unless File.exist?(File.join(Spider.paths[:public],'sass'))
+            FileUtils.mkdir_p(File.join(Spider.paths[:public],'img')) unless File.exist?(File.join(Spider.paths[:public],'img'))
+            if File.exist?(File.join(Spider.paths[:public],'sass')) && !File.exists?(File.join(Spider.paths[:public],'sass','custom_stile.scss'))
+                File.new(File.join(Spider.paths[:public],'sass','custom_stile.scss'), "w+")
+            end
         end
 
 
@@ -538,6 +544,8 @@ module Spider
             @paths[:log] = File.join(@paths[:var], 'log')
             @paths[:restart_file] = File.join(@paths[:tmp], 'restart.txt')
             @paths[:clear_file] = File.join(@paths[:tmp], 'clear.txt')
+            @paths[:public] = File.join(root, 'public')
+            @paths[:personalized_views] = File.join(root, 'views')
             @paths.each do |k, path|
                 @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
             end

data/lib/spiderfw/templates/layout.rb

@@ -6,7 +6,9 @@ module Spider
 #        allow_blocks :HTML, :Text, :Render, :Yield, :If, :TagIf, :Each, :Pass, :Widget
         attr_accessor :template
         attr_accessor :asset_set
+        attr_accessor :single_layout
         
+
         def init(scene)
             super
             @template = @template.is_a?(Template) ? @template : Template.new(@template)
@@ -40,52 +42,58 @@ module Spider
             cname += "-#{@asset_set}" if @asset_set
             @cname = cname
 
-            all_assets.each do |ass|
-                seen_check = ass[:runtime] || ass[:src]
-                next if ass[:src].blank? && !ass[:runtime]
-                next if seen[seen_check]
-                seen[seen_check] = true
-                ass[:app] = Spider.home if ass[:app] == :home
-                
-                ass = compile_asset(ass)
-
-                res = prepare_asset(ass, compress_assets, js_translations)
-                assets[:css] += res[:css]
-                assets[:js] += res[:js]
-
-            end
-
+            @content[:yield_to] = @template
+            #se sono nel layout del portale ho il :single_layout, se sono in un layout di un app faccio scaricare gli assets solo se ho single_layout a true
+            if  !/(admin|login|error|portal|simple|generic|cms|stampa)/.match(cname).blank? || self.single_layout 
+                all_assets.each do |ass|
+                    seen_check = ass[:runtime] || ass[:src]
+                    next if ass[:src].blank? && !ass[:runtime]
+                    next if seen[seen_check]
+                    seen[seen_check] = true
+                    ass[:app] = Spider.home if ass[:app] == :home
+                    
+                    ass = compile_asset(ass)
 
-            if @compile_less == false
-                less = Spider::Template.get_named_asset('less')
-                less.each do |ass|
-                    res = prepare_asset(parse_asset(ass[:type], ass[:src], ass).first)
+                    res = prepare_asset(ass, compress_assets, js_translations)
                     assets[:css] += res[:css]
                     assets[:js] += res[:js]
+
                 end
-            end
-            assets[:js].each do |ass|
-                if ass[:cpr]
-                    compressed = compress_javascript(ass)
-                    @template_assets[:js] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
-                else
-                    ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
-                    @template_assets[:js] << ass[:src]
+                #ordino gli assets in base al parametro order
+                assets[:css] = assets[:css].sort_by { |hsh| hsh[:order].to_i }
+                assets[:js] = assets[:js].sort_by { |hsh| hsh[:order].to_i }
+                
+                if @compile_less == false
+                    less = Spider::Template.get_named_asset('less')
+                    less.each do |ass|
+                        res = prepare_asset(parse_asset(ass[:type], ass[:src], ass).first)
+                        assets[:css] += res[:css]
+                        assets[:js] += res[:js]
+                    end
                 end
-            end
-            assets[:css].each do |ass|
-                if ass[:cpr]
-                    compressed = compress_css(ass)
-                    @template_assets[:css] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
-                else
-                    ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
-                    is_dyn = ass[:if_ie_lte] || ass[:media] || ass[:rel]
-                    @template_assets[:css] << (is_dyn ? ass : ass[:src])
+                assets[:js].each do |ass|
+                    if ass[:cpr]
+                        compressed = compress_javascript(ass)
+                        @template_assets[:js] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
+                    else
+                        ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
+                        @template_assets[:js] << ass[:src]
+                    end
+                end
+                assets[:css].each do |ass|
+                    if ass[:cpr]
+                        compressed = compress_css(ass)
+                        @template_assets[:css] << Spider.home.controller.pub_url+'/'+COMPILED_FOLDER+'/'+compressed
+                    else
+                        ass[:src] = ass[:cdn] if ass[:cdn] && use_cdn
+                        is_dyn = ass[:if_ie_lte] || ass[:media] || ass[:rel]
+                        @template_assets[:css] << (is_dyn ? ass : ass[:src])
+                    end
                 end
-            end
             
-            @content[:yield_to] = @template
-            @scene.assets = @template_assets
+                @scene.assets = @template_assets
+            end
+
             @scene.extend(LayoutScene)
             if js_translations.empty?
                 @scene.js_translations = ""

data/lib/spiderfw/templates/template.rb

@@ -286,13 +286,14 @@ module Spider
             res =  root.children ? root.children_of_type('tpl:asset') : []
             res_init = ""
             res.each do |r|
-                @assets << Spider::Template.parse_asset_element(r)
+                #se ho l'attributo runtime carico il file se il runtime coincide o non viene specificato
+                @assets << Spider::Template.parse_asset_element(r) if (r.get_attribute("runmode") == Spider.runmode || r.get_attribute("runmode").nil?)
                 r.set_attribute('class', 'to_delete')
             end
             new_assets = []
             @assets.each do |ass|
                 a = parse_asset(ass[:type], ass[:src], ass)
-                new_assets += a
+                new_assets += a unless new_assets.include?(a) #non inserisco duplicati
             end
             @assets = new_assets
             root.search('.to_delete').remove
@@ -323,6 +324,7 @@ module Spider
                         s_template.load(s)
                         @assets = s_template.assets + @assets
                     end
+
                 end
             end
             root.search('tpl:assets').remove
@@ -351,12 +353,15 @@ module Spider
                 # sub_c = sub.compile(options.merge({:mode => :widget}))
                 @assets = wt.compiled.assets + @assets
             end
-            
             seen = {}
             # @assets.each_index do |i|
             #     ass = @assets[i]
             #     if ass[:name]
             # end
+            #
+            #rendo univoco all'inizio l'array per non caricare piu' volte lo stesso asset
+            assets_univoci = @assets.uniq!
+            @assets = ( assets_univoci.nil? ? @assets : assets_univoci )
             @assets.each do |ass|
                 ass[:profiles] = ((ass[:profiles] || []) + @asset_profiles).uniq if @asset_profiles
                 next if seen[ass.inspect]
@@ -372,7 +377,7 @@ module Spider
             end
             compiled.block.init_code = res_init + compiled.block.init_code
             compiled.devel_info["source.xml"] = root.to_html
-            compiled.assets = (@assets + assets).uniq
+            compiled.assets = @assets #(@assets + assets).uniq sono univoci e assets == @assets
             return compiled
         end
         
@@ -446,6 +451,7 @@ module Spider
             else
                 base_url = ''
             end
+
             ass[:rel_path] = src
             ass[:src] = base_url + src
             ass_info = self.class.asset_types[type]
@@ -470,6 +476,8 @@ module Spider
             [:gettext, :media, :if_ie_lte, :cdn].each do |key|
                 ass[key] = attributes[key] if attributes.key?(key)
             end
+
+            ass[:order] = attributes[:order]
             return [ass]
         end