spiderfw 0.6.21 → 0.6.22

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

@@ -1,17 +1,37 @@
 <div class="{ @widget[:css_class] }">
     <tpl:assets widgets="core:crud" />
     <tpl:asset type="css" src="css/admin.css" />
-    <div class="heading">
+    <div class="heading" sp:if="@full_page">
 	    <div class="title">
     	    <h1>{ @title }</h1>
 	    </div>
 	    <div class="tools">
-	        Benvenuto, { @username }.
+	        Benvenuto, { @username }. -
 	        <a href="{ @logout_url }" sp:if="!@guest">Logout</a>
 	    </div>
     </div>
-    <div class="current_section">
+    <div class="current_section" sp:if="@full_page">
 	    <span id="label">{ @current }</span>
     </div>
-    <core:switcher id="switcher" use_template="table" />
+    <core:switcher id="switcher">
+        <tpl:override-attr name="class" value="spider-admin-container" />
+        <tpl:append-attr search=".sidebar" name="class" value="spider-admin-sidebar" />
+        <tpl:append-attr search=".content" name="class" value="spider-admin-content" />
+        <tpl:prepend search=".sidebar">
+            <div sp:if="@_parent && @_parent._parent && @_parent._parent.current_app && @_parent._parent.apps.length > 1" 
+                class="sidebar-app-info">
+                <h2>{ @_parent._parent.current_app[:module].full_name }</h2>
+            </div>
+        </tpl:prepend>
+        <tpl:prepend search=".content">
+            <ul class="breadcrumb" sp:if="@_parent._parent.admin_breadcrumb">
+                <li sp:each="@_parent._parent.admin_breadcrumb[0..@_parent._parent.admin_breadcrumb.length-2] |bc|">
+                    <a href="{ bc[:url] }">{ bc[:label] }</a> <span class="divider">/</span>
+                </li>
+                <li class="active" sp:if="@_parent._parent.admin_breadcrumb.last">
+                    { @_parent._parent.admin_breadcrumb.last[:label] }
+                </li>
+            </ul>
+        </tpl:prepend>
+    </core:switcher>
 </div>

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

@@ -12,9 +12,9 @@ module Spider; module Components
              end
         end
         
-        def add_action(name, value)
+        def add_action(name, value, type=nil)
             @actions ||= []
-            @actions << [name, value]
+            @actions << [name, value, type]
         end
         
         def collapse_params(h, first=true)

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

@@ -1,9 +1,12 @@
 <div class="">
     <form action="{ @request[:path] }" method="POST">
         <input sp:each="@params |name, value|" type="hidden" name="{ name }" value="{ value }" />
-        <tpl:placeholder name="text" />
+        <p>
+            <tpl:placeholder name="text" />
+        </p>
         <div class="actions">
-            <input sp:each="@actions |action|" type="submit" name="{ action[0] }" value="{ action[1] }" />
+            <input sp:each="@actions |action|" type="submit" name="{ action[0] }" value="{ action[1] }" 
+                class="btn { action[2] }" >
         </div>
     </form>
 </div>

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

@@ -9,11 +9,20 @@ module Spider; module Components
         attribute :table_elements
         i_attr_accessor :table_widget
         i_attr_accessor :form_widget
+        is_attribute :allow_create, :type => Spider::Bool, :default => true
         attr_accessor :fixed
 
         def route_widget
             [@action, @_action]
         end
+
+        def table
+            @widgets[:table]
+        end
+
+        def form
+            @widgets[:form]
+        end
         
         def prepare(action='')
             @action = (@_action_local && !@_action_local.empty?) ? :form : :table
@@ -114,7 +123,7 @@ module Spider; module Components
             end
             if @widgets[:ask_delete]
                 @widgets[:ask_delete].add_action('_w'+param_name(self)+'[delete_cancel]', _("Cancel"))
-                @widgets[:ask_delete].add_action('_w'+param_name(self)+'[do_delete]', _('Ok'))
+                @widgets[:ask_delete].add_action('_w'+param_name(self)+'[do_delete]', _('Ok'), "danger")
             end
             
             super

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

@@ -7,11 +7,6 @@
     <div sp:if="@deleted" class="flash">
         Cancellazione effettuata
     </div>
-    <div sp:if="@action == :form" class="top">
-        <a class="back" href="{ @widget[:request_path] }">
-            Torna all'elenco { @model.label_plural.downcase }
-        </a>
-    </div>
     <core:confirm id="ask_delete" sp:if="@ask_delete">
         <tpl:content name="text">
             Sei sicuro di voler cancellare i seguenti elementi?
@@ -23,38 +18,40 @@
         </tpl:content>
     </core:confirm>
     <sp:pass sp:if="!@ask_delete">
-        <div sp:if="@action == :table" class="top">
-            <a class="add" href="{ @widget[:request_path] }/new">
-                Crea nuovo
-            </a>
-        </div>
-        <div class="table_search" sp:if="@action == :table && @show_table_search">
-            <form action="{ @request[:path] }" method="GET">
-                <input type="text" name="_w{ param_name(@widget) }[table_q]" value="{ @table_q }">
-                <input type="submit" name="submit" value="Trova">
-                <input type="submit" name="_w{ param_name(@widget) }[clear_table_q]" value="Pulisci">
-            </form>
+        <div class="crud-actions">
+            <div class="table_search" sp:if="@action == :table && @show_table_search">
+                <form action="{ @request[:path] }" method="GET">
+                    <input type="text" name="_w{ param_name(@widget) }[table_q]" value="{ @table_q }">
+                    <input type="submit" name="submit" value="Trova">
+                    <input type="submit" name="_w{ param_name(@widget) }[clear_table_q]" value="Pulisci">
+                </form>
+            </div>
+            <div sp:if="@action == :table && @allow_create" class="add-item">
+                <a class="add" href="{ @widget[:request_path] }/new">
+                    Crea nuovo
+                </a>
+            </div>
         </div>
         <sp:run sp:if="@action == :table && @custom_table" obj="@custom_table" />
         <core:table sp:if="@action == :table && !@custom_table" id="table" model="@model">
-            <tpl:override-content search="table .row td">
+            <tpl:override-content search="table tbody tr td">
                 <a href="{ @links_to_form[row_i] }" sp:tag-if="element == @key_element"><tpl:overridden /></a>
             </tpl:override-content>
             <tpl:append search="table .heading_row">
                 <th>Sel.</th>
             </tpl:append>
-            <tpl:override search="table">
+            <tpl:override>
                 <form sp:if="@rows && @rows.length > 0" action="{ @request[:path] }" method="POST">
                     <tpl:overridden />
                     <div class="crud_table_actions">
-                        <input type='submit' name="_w{ param_name(@crud) }[delete]" value="Cancella selezionati">
+                        <input type='submit'  class="btn danger" name="_w{ param_name(@crud) }[delete]" value="Cancella selezionati">
                     </div>
                 </form>
             </tpl:override>
-            <tpl:append search="table .row">
+            <tpl:append search="table tbody tr">
                 <td align="center"><input type='checkbox' name="_w{ param_name(@crud) }[selected][{ @data[row_i][@key_element] }]"></td>
             </tpl:append>
-            <tpl:override-attr search="table .paginator td" name="colspan" value="{ elements.size + 1 }" />
+            <tpl:override-attr search="table tfoot td" name="colspan" value="{ elements.size + 1 }" />
         </core:table>
         <sp:run sp:if="@action == :form && @custom_form" obj="@custom_form" />
         <forms:form sp:if="@action == :form && !@custom_form" id="form" model="@model" show_related="true" show_additional_buttons="true" />

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

@@ -1,7 +1,6 @@
 <div class="{ @widget[:css_class] }">
-    <tpl:asset type="css" src="css/menu.css" />
     <sp:pass sp:each="@sections |section_name, items|">
-        <div class="section_title" sp:if="section_name">{ section_name }</div>
+        <h5 class="section_title" sp:if="section_name">{ section_name }</h5>
         <ul class="section_items">
             <li sp:each="items |label, target|" class="{ label == @current ? 'active' : 'inactive' }">
                 <a href="{ target }">{ label }</a>

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

@@ -5,7 +5,7 @@ module Spider; module Components
         
         attr_to_scene :current
         is_attribute :default
-        attr_reader :current, :current_label
+        attr_reader :current, :current_label, :links
         
         default_template 'default'
         
@@ -61,8 +61,7 @@ module Spider; module Components
             
             @sections.each do |section, labels|
                 labels.each do |label|
-                    menu_link = @link_mode == :path ? widget_request_path+'/'+@links[label] : "#{widget_request_path}?_wa[#{full_id}]=#{@links[label]}"
-                    @widgets[:menu].add(label, menu_link, section)
+                    @widgets[:menu].add(label, self.link(label), section)
                 end
             end
             @widgets[:menu].current = @current_label
@@ -85,6 +84,10 @@ module Spider; module Components
             res += @current.assets if @current
             return res
         end
+
+        def link(label)
+            @link_mode == :path ? widget_request_path+'/'+@links[label] : "#{widget_request_path}?_wa[#{full_id}]=#{@links[label]}"
+        end
         
         def self.label_to_link(label)
             label.downcase.gsub(/\s+/, '_').gsub(/[^a-zA-Z_]/, '')

data/apps/core/components/widgets/switcher/templates/default.shtml

@@ -1,6 +1,8 @@
 <div>
     <tpl:asset type="css" src="css/switcher.css" />
-    <core:menu id="menu"/>
+    <div class="sidebar">
+        <core:menu id="menu"/>
+    </div>
     <div id="content" class="content">
         <sp:render sp:if="@current.is_a?(Spider::Template)" obj="@current" />
         <sp:run sp:if="@current.is_a?(Spider::Widget)" obj="@current" />

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

@@ -34,18 +34,19 @@ module Spider; module Components
                 @sort_el = params['sort'].keys.first.to_sym 
                 @sort_dir = params['sort'].values.first.to_sym
                 @page = 1
+            elsif session[:sort]
+                @sort_el, @sort_dir = session[:sort]
             elsif @attributes[:sort]
                 el, dir = @attributes[:sort].split(',')
                 @sort_el = el.to_sym
                 @sort_dir = dir ? dir.to_sym : :asc
             end
-            if (@attributes[:paginate])
+            if @attributes[:paginate]
                 @page = params['page'] if params['page']
                 @page ||= 1
                 @page = @page.to_i
                 @offset = ((@page - 1) * @attributes[:row_limit])
             end
-            @sort_el, @sort_dir = session[:sort] if !@sort_el && session[:sort]
             session[:sort] = [@sort_el, @sort_dir] if @sort_el
             @scene.sorted = {}
             @scene.sorted[@sort_el] = @sort_dir if @sort_el

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

@@ -1,10 +1,9 @@
 <div class="{ @widget[:css_class] }">
-    <tpl:asset type="css" src="css/table.css" />
-	<tpl:asset type="js" src="widgets/table.js" />
-    <table sp:if="@rows && @rows.length > 0" class="{ @widget[:css_class] }">
+    <tpl:asset type="js" src="widgets/table.js" />
+    <table sp:if="@rows && @rows.length > 0" class="{ @widget[:css_class] }" class="bordered-table zebra-striped">
         <thead>
             <tr class="heading_row">
-                <th sp:each="@elements |element|" class="{ (@sorted[element] ? 'sorted-'+@sorted[element].to_s : '') }">
+                <th sp:each="@elements |element|" class="{ @sortable[element] ? 'sortable' : '' }  { (@sorted[element] ? 'sorted-'+@sorted[element].to_s : '') }">
                     <a sp:tag-if="@sortable[element]" href="{ @request[:path] }?_w{ @widget[:param] }[sort][{ element }]={ @sorted[element] == :asc ? 'desc' : 'asc' }">
                         { @labels[element] }
                     </a>
@@ -13,7 +12,7 @@
         </thead>
         <tbody>
             <tpl:pass sp:each_index="@rows |row_i|">
-                <tr class="row { (row_i%2==0) ? 'odd' : 'even' }">
+                <tr class="{ (row_i%2==0) ? 'odd' : 'even' }">
                     <td sp:each="@elements |element|">
                         <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }">
                             { @rows[row_i][element] }
@@ -22,27 +21,47 @@
                 </tr>
             </tpl:pass>
         </tbody>
-        <tfoot>
-            <tr class="paginator" sp:if="@paginate && @pages > 1">
-                <td colspan="{ @columns }" >
-                    <a sp:if="@page > 1" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">Indietro</a>
-                    <sp:pass sp:if="@paginate_first > 1">
-                        <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a> ... 
-                    </sp:pass>
-                    <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
-                        <a sp:if="i != @page" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }" class="page">
-                            { i }
-                        </a>
-                        <span sp:if="i == @page" class="current">{ i }</span>
-                    </sp:pass>
-                    <sp:pass sp:if="@paginate_last < @pages-1">
-                        ... <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }" class="page">{ @pages }</a> 
-                    </sp:pass>
-                    <a sp:if="@has_more" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }">Avanti</a>
-                </td>
-            </tr>
-        </tfoot>
     </table>
+    <div sp:if="@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>
+            </li>
+            <li sp:if="@page == 1" class="disabled">
+                <a class="prev disabled">&larr; _(Previous)</a>
+            </li>
+            <sp:pass sp:if="@paginate_first > 1">
+                <li>
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a>
+                </li>
+                <li class="disabled"><a>...</a></li>
+            </sp:pass>
+            <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
+                <li sp:if="i != @page">
+                    <a  href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }" class="page">
+                        { i }
+                    </a>
+                </li>
+                <li class="active" sp:if="i == @page" >
+                    <a class="current">{ i }</span>
+                </li>
+            </sp:pass>
+            <sp:pass sp:if="@paginate_last < @pages-1">
+                <li class="disabled"> 
+                    <a>...</a>
+                </li>
+                <li>
+                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }" class="page">{ @pages }</a> 
+                </li>
+            </sp:pass>
+            <li sp:if="@has_more">
+                <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }">_(Next) &rarr;</a>
+            </li>
+            <li sp:if="!@has_more" class="disabled">
+                <a class="next disabled">_(Next) &rarr;</a>
+            </li>
+        </ul>
+    </div>
     <div sp:if="!@rows || @rows.length < 1" class="no_result">
         _(No element)
     </div>

data/apps/core/forms/po/it/spider_forms.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2011-09-13 14:25+0200\n"
-"PO-Revision-Date: 2010-11-29 12:52+0100\n"
+"POT-Creation-Date: 2011-11-15 16:13+0100\n"
+"PO-Revision-Date: 2011-11-15 16:13+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -32,6 +32,10 @@ msgstr "%s e nuovo"
 msgid "%s and stay"
 msgstr "%s e rimani"
 
+#: widgets/form/form.rb:466
+msgid "New"
+msgstr "Nuovo"
+
 #: widgets/inputs/date_time/date_time.rb:25
 msgid "%s is not a valid date"
 msgstr "%s non è una data valida"
@@ -59,3 +63,4 @@ msgstr "Minuti"
 #: widgets/inputs/time_span/time_span.shtml:6
 msgid "Hours"
 msgstr "Ore"
+

data/apps/core/forms/po/spider_forms.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2011-09-13 14:25+0200\n"
+"POT-Creation-Date: 2011-11-15 16:13+0100\n"
 "PO-Revision-Date: 2009-06-30 17:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,6 +33,10 @@ msgstr ""
 msgid "%s and stay"
 msgstr ""
 
+#: widgets/form/form.rb:466
+msgid "New"
+msgstr ""
+
 #: widgets/inputs/date_time/date_time.rb:25
 msgid "%s is not a valid date"
 msgstr ""

data/apps/core/forms/public/css/form.css

@@ -28,14 +28,14 @@
 	right: 8px;
 }
 
-.spider.forms.form .row.error label{
+.spider.forms.form .formrow.error label{
 }
 
-.spider.forms.form .row.error input{
+.spider.forms.form .formrow.error input{
     background-color: #FF9999;
 }
 
-.spider.forms.form .row{
+.spider.forms.form .formrow{
     clear: both;
     overflow: hidden;
     margin-top: 5px;

data/apps/core/forms/public/css/html_area.css

@@ -1,3 +1,2 @@
 .spider.forms.form div.wdgt-Spider-Forms-HTMLArea{
-    float: left;
 }

data/apps/core/forms/public/date_time.js

@@ -4,6 +4,7 @@ Spider.defineWidget('Spider.Forms.DateTime', {
 	
 	ready: function(){
 	    var conf = {};
+        this.input = this.el.find('input');
 	    if (this.el.is('.change-month')) conf.changeMonth = true;
 	    if (this.el.is('.change-year')) conf.changeYear = true;
         var classes = this.el.attr('class').split(' ');
@@ -15,9 +16,9 @@ Spider.defineWidget('Spider.Forms.DateTime', {
                 a = 3;
             }
         }
-		if (this.el.is('.date')) this.el.datepicker(conf);
-		else if (this.el.is('.date_time')){
-			var el = this.el;
+		if (this.input.is('.date')) this.input.datepicker(conf);
+		else if (this.input.is('.date_time')){
+			var el = this.input;
 			el.hide();
 			var val = el.val().split(' ');
 			if (!val[1]) val[1] = '';

data/apps/core/forms/public/select.js

@@ -3,15 +3,16 @@ Spider.defineWidget('Spider.Forms.Select', 'Spider.Forms.Input', {
 	autoInit: true,
 	
 	ready: function(){
-		if (this.el.is('select[multiple]')){
-            this.el.attr('title', 'Aggiungi...');
-		    this.el.bsmSelect({
+        var sel = this.el.find('select');
+		if (sel.is('select[multiple]')){
+            sel.attr('title', 'Aggiungi...');
+		    sel.bsmSelect({
                 removeLabel: 'togli',
                 highlightAddedLabel: 'Aggiunto: ',
                 highlightRemovedLabel: 'Tolto: ',
                 addItemTarget: 'bottom'
     		});
-            $('.bsmSelect option:first', this.el.parent()).addClass('bsmSelectTitle')
+            $('.bsmSelect option:first', sel.parent()).addClass('bsmSelectTitle')
                 .attr("selected", false)
 				.attr("disabled", true);
 		} 

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

@@ -1,7 +1,7 @@
 <%
 @attributes['inputs_hash'] ||= '@inputs'
 %>
-<label for="{ <%=@attributes['inputs_hash']%>[<%=@attributes['element']%>].full_id }">
+<label for="{ <%=@attributes['inputs_hash']%>[<%=@attributes['element']%>].full_id }-input">
     { <%=@attributes['inputs_hash']%>[<%=@attributes['element']%>].label }
     <em class="form_required_symbol" sp:if="<%=@attributes['required']%>">*</em>
 </label>

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

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

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

@@ -250,7 +250,7 @@ module Spider; module Forms
                         widget_type = el.type.attributes[:estimated_size] && el.type.attributes[:estimated_size] > 30 ? 
                             SearchSelect : Select
                     elsif @attributes[:show_related] && @pk && el.multiple?
-                        @sub_links[@pk+'/'+el.label.downcase.gsub(/\s+/, '_')] = @labels[el.name]
+                        @sub_links[el.name] = sub_link(el)
                     end
                 end
                 input = create_input(widget_type, el) if widget_type
@@ -450,6 +450,28 @@ module Spider; module Forms
         def disable(*names)
             @disabled += names
         end
+
+        def breadcrumb
+            bc = []
+            if @obj
+                bc << {:label => @obj.to_s, :url => widget_request_path+'/'+@pk}
+                if @crud
+                    sl = sub_link(@sub_element)
+                    bc << {:label => sl[:label], :url => widget_request_path+'/'+sl[:link] }
+                    if @crud.action == :form
+                        bc += @crud.form.breadcrumb
+                    end
+                end
+            else
+                bc << {:label => _('New'), :url => widget_request_path}
+            end
+            bc
+            
+        end
+
+        def sub_link(el)
+            {:link => @pk+'/'+el.label.downcase.gsub(/\s+/, '_'), :label => @labels[el.name]}
+        end
         
         
         def self.parse_content(doc)

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

@@ -1,6 +1,5 @@
 <div class="{ @widget[:css_class] }">
     <tpl:assets widgets="forms:datetime,forms:file,forms:select,forms:search-select,forms:textarea" />
-	<tpl:asset type="css" src="css/form.css" />
 	<tpl:asset type="js" src="form.js" />
 	<div sp:if="@error" class='errors'>
 		<ul>
@@ -29,18 +28,18 @@
 			<div class="fields">
 				<forms:element_row sp:each="@names |element|" element="element" required="@inputs[element].required?"/>
 			</div>
-			<div class="row buttons">
-				<input type='submit' name='_w{ @widget[:param] }[submit]' value='{ @submit_text }'>
-				<input type='submit' sp:if="@show_submit_and_stay" name='_w{ @widget[:param] }[submit_and_stay]' value='{ @submit_and_stay_text }'>
-				<input type='submit' sp:if="@show_submit_and_new" name='_w{ @widget[:param] }[submit_and_new]' value='{ @submit_and_new_text }'>
-				<input sp:each="@submit_buttons |text|" type='submit' name='_w{ @widget[:param] }[submit]' value='{ text }'>
+			<div class="actions">
+				<input type='submit' class="btn primary" name='_w{ @widget[:param] }[submit]' value='{ @submit_text }'>
+				<input type='submit' sp:if="@show_submit_and_stay" class="btn" name='_w{ @widget[:param] }[submit_and_stay]' value='{ @submit_and_stay_text }'>
+				<input type='submit' sp:if="@show_submit_and_new" class="btn" name='_w{ @widget[:param] }[submit_and_new]' value='{ @submit_and_new_text }'>
+				<input sp:each="@submit_buttons |text|" type='submit' class="btn" name='_w{ @widget[:param] }[submit]' value='{ text }'>
 			</div>
 		</form>
 		<div class="sub_links" sp:if="!@sub_links.empty?">
 			<h4>Dati collegati:</h4>
 			<ul>
-				<li sp:each="@sub_links |link, label|">
-					<a href="{ @widget[:request_path] }/{ link }">{ label }</a>
+				<li sp:each="@sub_links |el, l|">
+					<a href="{ @widget[:request_path] }/{ l[:link] }">{ l[:label] }</a>
 				</li>
 			</ul>
 		</div>

data/apps/core/forms/widgets/inputs/checkbox/checkbox.shtml

@@ -1,3 +1,3 @@
-<sp:template>
-    <input type="checkbox" name="{ @name }" value="1" size="{ @size }" sp:attr-if="@value,checked">
-</sp:template>
+<div class="input">
+    <input type="checkbox" name="{ @name }" id="input" value="1" size="{ @size }" sp:attr-if="@value,checked">
+</div>

data/apps/core/forms/widgets/inputs/date_time/date_time.shtml

@@ -1,6 +1,6 @@
-<sp:template>
+<div class="input">
     <tpl:asset type="js" src="input.js" />
     <tpl:asset name="jquery-ui-datepicker" />
     <tpl:asset type="js" src="date_time.js" />
-    <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }" class="{ @mode } { @additional_classes.join(' ') }">
-</sp:template>
+    <input type="text" name="{ @name }" id="input" value="{ @formatted_value }" size="{ @size }" class="{ @mode } { @additional_classes.join(' ') }">
+</div>

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

@@ -7,7 +7,7 @@ module Spider; module Forms
     
     class FileInput < Input
         tag 'file'
-        is_attr_accessor :save_path, :type => String, :default => lambda{ Spider.paths[:data]+'/uploaded_files' }
+        is_attr_accessor :save_path, :type => String, :default => lambda{ Spider.paths[:var]+'/data/uploaded_files' }
         
         def needs_multipart?
             true
@@ -15,7 +15,9 @@ module Spider; module Forms
         
         def prepare
             raise "No save path defined" unless @save_path
-            raise "Save path #{@save_path} is not a directory" unless File.directory?(@save_path)
+            raise "Save path #{@save_path} is not a directory" unless File.directory?(File.dirname(@save_path))
+            FileUtils.mkdir_p(@save_path) unless File.directory?(@save_path)
+
             super
         end
         

data/apps/core/forms/widgets/inputs/file_input/file_input.shtml

@@ -7,6 +7,6 @@
         <span class="clear">(<input type="checkbox" name="{ @name }[clear]"> _(Clear))</span>
     </div>
     <div class="change"><span sp:if="@value && !@value.to_s.empty?"><span class="change-label">_(Change)</span>:</span>
-        <input type="file" name="{ @name }[file]" value="{ @value }" size="{ @size }">
+        <input type="file" name="{ @name }[file]" id="input" value="{ @value }" size="{ @size }">
     </div>
 </div>

data/apps/core/forms/widgets/inputs/hidden/hidden.shtml

@@ -1,3 +1,3 @@
 <sp:template>
-    <input type="hidden" name="{ @name }" value="{ @value }">
+    <input type="hidden" name="{ @name }" id="input" value="{ @value }">
 </sp:template>

data/apps/core/forms/widgets/inputs/html_area/html_area.shtml

@@ -1,4 +1,4 @@
-<div>
+<div class="input">
     <tpl:asset type="js" src="ckeditor/ckeditor.js" compressed="true" copy_dir="true"/>
     <tpl:asset type="js" src="ckeditor/adapters/jquery.js" compressed="true" />
     <tpl:asset name="jquery" />
@@ -10,5 +10,5 @@
     <div class="initial_html" style="display:none">{ @initial_html }</div>
     <div class="css" style="display:none">{ @css }</div>
     <div class="options" style="display:none">{ @options }</div>
-    <textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
+    <textarea name="{ @name }" id="input" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
 </div>

data/apps/core/forms/widgets/inputs/password/password.shtml

@@ -1,5 +1,5 @@
 <div class="input">
-    <input type="password" name="{ @name }[pwd1]" value="" size="{ @size }"><br>
-    <div class="notice">Ripeti la password:</div>
-    <input type="password" name="{ @name }[pwd2]" value="" size="{ @size }"><br>
+    <input type="password" name="{ @name }[pwd1]" id="input" value="" size="{ @size }"><br>
+    <div class="help-block">Ripeti la password:</div>
+    <input type="password" name="{ @name }[pwd2]" id="input2" value="" size="{ @size }"><br>
 </div>