From 2301bdd1d007db28a88425d084b955d7a1c76d8f Mon Sep 17 00:00:00 2001 From: pierangelo Date: Tue, 2 Jul 2013 10:48:47 +0200 Subject: [PATCH 1/2] wizard: corretta la visualizzazione dei checkbox su FF --- app/main/wizard/_action/create.lua | 12 +++++ app/main/wizard/_checkbox_bs.lua | 6 +-- app/main/wizard/_checkbox_bs_pag10.lua | 6 +-- app/main/wizard/_page_bs10.lua | 13 ++++-- app/main/wizard/_page_bs11.lua | 28 +++++++++-- app/main/wizard/_page_bs12.lua | 10 ++-- app/main/wizard/wizard_new_initiative_bs.lua | 49 +++++++++++++++----- 7 files changed, 97 insertions(+), 27 deletions(-) diff --git a/app/main/wizard/_action/create.lua b/app/main/wizard/_action/create.lua index 7750135c..754fb344 100755 --- a/app/main/wizard/_action/create.lua +++ b/app/main/wizard/_action/create.lua @@ -1,3 +1,15 @@ + +if param.get("indietro")=="true" then + +return request.redirect{ + module = "wizard", + view = "show_ext_bs", + id=issue.id +} + + +end + local issue local area diff --git a/app/main/wizard/_checkbox_bs.lua b/app/main/wizard/_checkbox_bs.lua index 7c7ee742..469f6afd 100644 --- a/app/main/wizard/_checkbox_bs.lua +++ b/app/main/wizard/_checkbox_bs.lua @@ -19,7 +19,7 @@ end -ui.container{attr={class="row-fluid", style="width:34em;height: 5em;"},content=function() +ui.container{attr={class="row-fluid", style="width:34em;height: 5em;",onclick="doCheck("..id_checkbox..")"},content=function() ui.container{attr={class="span12"},content=function() ui.container { @@ -28,13 +28,13 @@ ui.container{attr={class="span12"},content=function() ui.tag { tag="a", - attr={id="proposer"..id_checkbox,class="btn btn-primary btn-large table-cell eq_btn" ,style="height: 62px!important;width: 2em;",onclick="doCheck("..id_checkbox..")"}, + attr={id="proposer"..id_checkbox,class="btn btn-primary btn-large table-cell eq_btn1" ,style="height: 62px!important;width: 2em;"}, content=function() ui.heading{ level=4, attr = {class = "fittext_btn_wiz" }, content=function() ui.container{attr={class="row-fluid"},content=function() ui.container{attr={class="span12" },content=function() - ui.image{ attr = {id="imgCheck"..id_checkbox, class="arrow_medium" ,style="display:"..display..";"}, static="svg/V_checked.svg"} + ui.image{ attr = {id="imgCheck"..id_checkbox, class="arrow_medium" ,style="display:"..display..";",onclick="doCheck("..id_checkbox..")"}, static="svg/V_checked.svg"} end } end } end } diff --git a/app/main/wizard/_checkbox_bs_pag10.lua b/app/main/wizard/_checkbox_bs_pag10.lua index 7f458876..d6cb5042 100644 --- a/app/main/wizard/_checkbox_bs_pag10.lua +++ b/app/main/wizard/_checkbox_bs_pag10.lua @@ -19,8 +19,8 @@ end -ui.container{attr={class="row-fluid", style="width: 5em;height: 5em;float:left;"},content=function() -ui.container{attr={class="span12",style=" width: 5em; "},content=function() +ui.container{attr={class="row-fluid", style="width: 5em;height: 5em;float:left;",onclick="doCheckPag10("..id_checkbox..")"},content=function() +ui.container{attr={class="span12"},content=function() ui.container { attr={class="span3 text-center",style=" width: 5em; "}, @@ -28,7 +28,7 @@ ui.container{attr={class="span12",style=" width: 5em; "},content=function() ui.tag { tag="a", - attr={id="check"..id_checkbox,class="btn btn-primary btn-large table-cell eq_btn" ,style="width: 2em; height: 2.5em!important;",onclick="doCheckPag10("..id_checkbox..")"}, + attr={id="check"..id_checkbox,class="btn btn-primary btn-large table-cell eq_btn1" ,style="width: 2em;height: 62px!important;"}, content=function() ui.heading{ level=4, attr = {class = "fittext_btn_wiz" }, content=function() diff --git a/app/main/wizard/_page_bs10.lua b/app/main/wizard/_page_bs10.lua index 8dbc70d1..d7cd0a3e 100644 --- a/app/main/wizard/_page_bs10.lua +++ b/app/main/wizard/_page_bs10.lua @@ -89,7 +89,8 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function end --contenuto - + ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function() + ui.container{attr={class="span12 text-center"},content=function() --1* selezione ui.container { @@ -392,12 +393,18 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function end }--fine form - + + + end} + end} end } end } - +ui.script{static = "js/jquery.equalheight.js"} +ui.script{script = '$(document).ready(function() { equalHeight($(".eq_btn")); $(window).resize(function() { equalHeight($(".eq_btn")); }); }); ' } +ui.script{static = "js/jquery.fittext.js"} +ui.script{script = "jQuery('.fittext').fitText(0.9, {minFontSize: '10px', maxFontSize: '28px'}); " } ui.container{attr={class="row-fluid"},content=function() diff --git a/app/main/wizard/_page_bs11.lua b/app/main/wizard/_page_bs11.lua index f1b05566..e4ed727f 100644 --- a/app/main/wizard/_page_bs11.lua +++ b/app/main/wizard/_page_bs11.lua @@ -62,13 +62,32 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function ui.hidden_field{name="indietro" ,value=false} ui.hidden_field{name="proposer_hidden" ,value=false} + + local proposer1 + local proposer2 + local proposer3 for i,k in ipairs(wizard) do ui.hidden_field{name=k.name ,value=k.value} if k.value then trace.debug("[wizard] name="..k.name.." | value="..k.value) + + if k.name =="proposer1" then + proposer1="true" + end + + if k.name =="proposer2" then + proposer2="true" + end + + if k.name =="proposer3" then + proposer3="true" + end + + end end + --contenuto ui.container { attr={style="float: left; border: 0px solid black; position: relative; vertical-align: middle; width: 96%; margin-bottom: 8em; margin-top: 4em; text-align: left; margin-left: 1.6em;"}, @@ -84,7 +103,8 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function view="_checkbox_bs", params={ id_checkbox="1", - label=_"Citiziens" + label=_"Citiziens", + selected=proposer1 } } @@ -95,7 +115,8 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function view="_checkbox_bs", params={ id_checkbox="2", - label=_"Elected M5S" + label=_"Elected M5S", + selected=proposer2 } } @@ -107,7 +128,8 @@ ui.container{attr={class="row-fluid",style="padding-top: 2em;"},content=function view="_checkbox_bs", params={ id_checkbox="3", - label=_"Other groups" + label=_"Other groups", + selected=proposer1 } } diff --git a/app/main/wizard/_page_bs12.lua b/app/main/wizard/_page_bs12.lua index 7cd9d016..c52acabe 100644 --- a/app/main/wizard/_page_bs12.lua +++ b/app/main/wizard/_page_bs12.lua @@ -43,15 +43,17 @@ ui.container{attr={class="row-fluid"},content=function() ui.container{ attr = { class = "row-fluid" }, content = function() ui.container{ attr = { class = "span12 text-center" }, content = function() - ui.link{ - attr = { class="btn btn-primary btn-large large_btn table-cell" ,style="width: 9em; float: left;"}, + ui.tag{ + tag="a", + attr = { class="btn btn-primary btn-large large_btn table-cell" ,style="width: 9em; float: left;",onclick="window.history.back()"}, module = "wizard", view = "wizard_new_initiative_bs", params={ area_id=area_id, unit_id=unit_id, - page=11 - }, + page=12, + indietro=true + }, content = function() ui.heading{level=3,attr={class="fittext_back_btn"},content=function() ui.image{ attr = { class="arrow_medium"}, static="svg/arrow-left.svg"} diff --git a/app/main/wizard/wizard_new_initiative_bs.lua b/app/main/wizard/wizard_new_initiative_bs.lua index ecaf7ea4..d2068313 100644 --- a/app/main/wizard/wizard_new_initiative_bs.lua +++ b/app/main/wizard/wizard_new_initiative_bs.lua @@ -229,18 +229,45 @@ if page==11 then objParam[#objParam+1]= {name="initiative_brief_description",value=param.get("initiative_brief_description")} objParam[#objParam+1]= {name="draft",value=param.get("draft")} objParam[#objParam+1]= {name="technical_area_1",value=param.get("technical_area_1")} - else +-- else +-- +-- objParam[#objParam+1]= {name="issue_title",value=param.get("issue_title")} +-- objParam[#objParam+1]= {name="policy_id",value=param.get("policy_id")} +-- objParam[#objParam+1]= {name="issue_brief_description",value=param.get("issue_brief_description")} +-- objParam[#objParam+1]= {name="issue_keywords",value=param.get("issue_keywords")} +-- objParam[#objParam+1]= {name="problem_description",value=param.get("problem_description")} +-- objParam[#objParam+1]= {name="aim_description",value=param.get("aim_description")} +-- objParam[#objParam+1]= {name="initiative_title",value=param.get("initiative_title")} +-- objParam[#objParam+1]= {name="initiative_brief_description",value=param.get("initiative_brief_description")} +-- objParam[#objParam+1]= {name="draft",value=param.get("draft")} +-- objParam[#objParam+1]= {name="technical_area_1",value=param.get("technical_area_1")} + + + + + local value="" + local proposer="" + if param.get("proposer_hidden_1") then + + value=param.get("proposer_hidden_1") + proposer="proposer1" + end + if param.get("proposer_hidden_2") then + + value=param.get("proposer_hidden_2") + proposer="proposer2" + end + if param.get("proposer_hidden_3") then + + value=param.get("proposer_hidden_3") + proposer="proposer3" + + end + + objParam[#objParam+1]= {name=proposer,value=value} + + - objParam[#objParam+1]= {name="issue_title",value=param.get("issue_title")} - objParam[#objParam+1]= {name="policy_id",value=param.get("policy_id")} - objParam[#objParam+1]= {name="issue_brief_description",value=param.get("issue_brief_description")} - objParam[#objParam+1]= {name="issue_keywords",value=param.get("issue_keywords")} - objParam[#objParam+1]= {name="problem_description",value=param.get("problem_description")} - objParam[#objParam+1]= {name="aim_description",value=param.get("aim_description")} - objParam[#objParam+1]= {name="initiative_title",value=param.get("initiative_title")} - objParam[#objParam+1]= {name="initiative_brief_description",value=param.get("initiative_brief_description")} - objParam[#objParam+1]= {name="draft",value=param.get("draft")} - objParam[#objParam+1]= {name="technical_area_1",value=param.get("technical_area_1")} end From 02cfb2c164583352ace458099a25b1ada185d21c Mon Sep 17 00:00:00 2001 From: pierangelo Date: Tue, 2 Jul 2013 11:08:28 +0200 Subject: [PATCH 2/2] wizard: fix del campo member_id in fase di creazione della initiative --- app/main/wizard/_action/create.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/app/main/wizard/_action/create.lua b/app/main/wizard/_action/create.lua index 754fb344..9ba80110 100755 --- a/app/main/wizard/_action/create.lua +++ b/app/main/wizard/_action/create.lua @@ -98,6 +98,7 @@ if not issue then issue = Issue:new() issue.area_id = area.id issue.policy_id = policy_id + issue.member_id=app.session.member_id issue.title=param.get("issue_title") issue.brief_description=param.get("issue_brief_description") issue.problem_description=param.get("problem_description")