Skip to content

Commit

Permalink
Merge branch 'test' of https://github.com/Movimento5StelleLazio/Parla…
Browse files Browse the repository at this point in the history 
…mentoElettronicoM5S into develop
  • Loading branch information
root committed Jun 29, 2013
2 parents 44cb919 + 95b824c commit 766e5f1
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 27 deletions.
13 changes: 13 additions & 0 deletions app/main/wizard/_action/create.lua
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -86,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")
Expand Down
6 changes: 3 additions & 3 deletions app/main/wizard/_checkbox_bs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions app/main/wizard/_checkbox_bs_pag10.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@

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; "},
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()

Expand Down
13 changes: 10 additions & 3 deletions app/main/wizard/_page_bs10.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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()
Expand Down
28 changes: 25 additions & 3 deletions app/main/wizard/_page_bs11.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;"},
Expand All @@ -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
}
}

Expand All @@ -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
}
}

Expand All @@ -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
}
}

Expand Down
10 changes: 6 additions & 4 deletions app/main/wizard/_page_bs12.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
49 changes: 38 additions & 11 deletions app/main/wizard/wizard_new_initiative_bs.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 766e5f1

Please sign in to comment.