Merge remote-tracking branch 'Movimento/ParlamentoElettronicoM5S/test…

…' into test

app/main/index/_welcome_bs.lua

@@ -78,7 +78,7 @@ if app.session.member_id then
                 ui.anchor{
                   attr = {
                     href = "#",
-                    class = "btn btn-primary table-cell",
+                    class = "btn btn-primary table-cell medium_btn",
                     onclick = "alert('Posizione aggiornata! (Non implementato)');"
                   },
                   content=function()
@@ -137,7 +137,7 @@ if app.session.member_id then
                 ui.anchor{
                   attr = {
                     href = "#",
-                    class = "btn btn-primary table-cell", 
+                    class = "btn btn-primary table-cell medium_btn", 
                     onclick = "alert('Dato sospetto segnalato! (Non implementato)' );"
                   },
                   content=function()

app/main/initiative/_list_element_ext2_bs.lua

@@ -32,7 +32,7 @@ ui.container{ attr = { class = "row-fluid" }, content = function()
             view = "show",
             content = function()
               ui.heading{level=5,attr={class=""},content=function()
-                slot.put(_"Read")
+                slot.put(_"Read".." p"..initiative.id)
               end }
             end
           }
@@ -125,7 +125,7 @@ ui.container{ attr = { class = "row-fluid" }, content = function()
             name = encode.html(initiative.shortened_name)
           end
           ui.heading{ level=6, content =function()
-            ui.tag{tag="strong",content= "i" .. initiative.id .. ": "..name }
+            ui.tag{tag="strong",content= "p" .. initiative.id .. ": "..name }
           end }
         end,
         module  = "initiative",

app/main/issue/show_ext_bs.lua

@@ -174,7 +174,15 @@ ui.container{attr={class="row-fluid"}, content=function()
         ui.heading{ level=5, attr = { class = "uppercase" }, content = function()
           ui.tag{content= _"By user:" }
         end }
-        slot.put("user image")
+      end }
+    end }
+    ui.container{ attr = { class = "row-fluid"}, content = function()
+      ui.container{ attr = { class = "span6"}, content = function()
+        if issue.member_id > 0 then
+          execute.view{ module="member", view="_info_data", id=issue.member_id }
+        else
+          ui.heading{ level=6, content = _"No author for this issue" }
+        end
       end }
     end }
     ui.container{ attr = { class = "row-fluid spaceline"}, content = function()
@@ -187,9 +195,10 @@ ui.container{attr={class="row-fluid"}, content=function()
     end }
     ui.container{ attr = { class = "row-fluid"}, content = function()
       ui.container{ attr = { class = "span12"}, content = function()
-        for i=1,5,1 do 
+        keywords={"lavoro","scuola","educazione","finanza"}
+        for i,k in ipairs(keywords) do
           ui.tag{tag="span",attr={ class="btn btn-danger btn-small filter_btn"}, content=function()
-            ui.heading{ level=6, attr = { class = "uppercase" },content = "keyword"}
+            ui.heading{ level=6, attr = { class = "uppercase" },content = k}
           end }
         end
       end }
@@ -204,9 +213,10 @@ ui.container{attr={class="row-fluid"}, content=function()
     end }
     ui.container{ attr = { class = "row-fluid"}, content = function()
       ui.container{ attr = { class = "span12"}, content = function()
-        for i=1,3,1 do 
+        areas={"biologia","chimica","fisica", "ingegneria edile", "riciclaggio", "ecologia"}
+        for i,k in ipairs(areas) do
           ui.tag{tag="span",attr={ class="btn btn-info btn-small filter_btn"}, content=function()
-            ui.heading{ level=6, attr = { class = "uppercase" },content = "area"}
+            ui.heading{ level=6, attr = { class = "uppercase" },content = k}
           end }
         end
       end }
@@ -246,7 +256,7 @@ ui.container{attr={class="row-fluid"}, content=function()
               content= _"initiatives"
             end
 
-            ui.tag{content= _("Vi sono attualmente #{count} #{initiatives} per risolvere la questione sollevata. Decidi a quale dare il tuo sostegno o presenta una proposta tua. Almeno una proposta tra quelle presentate deve raggiungere il quorum di sostenitori entro #{days} affinche' questione venga ammessa alla fase successiva.",{ count=#issue.initiatives, initiatives=content}) }
+            ui.tag{content= _("Vi sono attualmente #{count} proposte per risolvere la questione sollevata. Decidi a quale dare il tuo sostegno o presenta una proposta tua. Almeno una proposta tra quelle presentate deve raggiungere il quorum di sostenitori entro #{days} affinche' la questione venga ammessa alla fase successiva.",{ count=#issue.initiatives, days=content}) }
           end }
 
           ui.container{ attr = { class = "span3"}, content = function()
@@ -339,7 +349,7 @@ ui.container{attr={class="row-fluid"}, content=function()
 --                limit = (for_listing or for_initiative) and 5 or nil,
 --                hide_more_initiatives=false,
 --                limit=25,
---                for_details=true,
+                for_details=true,
 --                for_member = for_member,
                 init_ord=init_ord
               }

app/main/member/_info_data.lua

@@ -0,0 +1,36 @@
+local member = Member:by_id(param.get_id())
+
+ui.container{attr={class="row-fluid"}, content=function()
+  ui.container{attr={class="span12 member_data"}, content=function()
+    ui.container{attr={class="row-fluid"}, content=function()
+      ui.container{attr={class="span2 text-center"}, content=function()
+
+        execute.view{
+          module = "member_image",
+          view = "_show",
+          params = {
+            member = member,
+            image_type = "avatar",
+            show_dummy = true,
+            class= "member_img_bs"
+          }
+        }
+
+      end }
+      ui.container{attr={class="span10"}, content=function()
+
+        ui.heading{level=6,content=function()
+          ui.tag{content=_"Name"..": "}
+          ui.tag{tag="strong",content=member.realname}
+        end }
+        ui.heading{level=6,content=function()
+          ui.tag{content=_"Codice Fiscale"..": "}
+          ui.tag{tag="strong",content=member.codice_fiscale}
+        end }
+
+      end }
+    end }
+
+  end }
+end }
+

extras/set_issue_authors.sql

@@ -0,0 +1 @@
+UPDATE issue SET member_id = 523;

locale/translations.it.lua

@@ -23,6 +23,7 @@ return {
 ["Details for issue Q"]="Dettagli questione Q";
 ["Issue link (copy the link and share to the web):"]="Link alla questione (copia il link e condividilo sul web):";
 ["Copy"]="Copia";
+["No author for this issue"]="Nessun autore per questa questione";
 ["Select"]="Seleziona";
 ["Issue created at:"]="Questione sollevata il:";
 ["Time limit to reach the supporters quorum:"]="Data limite per raggiungere il quorum di sostenitori:";

static/less/custom.less

@@ -102,6 +102,18 @@ h1, h2, h3, h4, h5, h6 {
   #gradient > .vertical(@orange, darken(@orange,5%) );
 }
 
+/*
+  Member
+*/
+
+.member_img_bs {
+  margin: 5px;
+  border: 1px solid @orange;
+  .border-radius(@radius: 3px);
+  max-width: 100px;
+  max-height: 100px;
+}
+
 /*
   Issue
 */
@@ -110,7 +122,7 @@ h1, h2, h3, h4, h5, h6 {
   .box-shadow(0px 5px 11px grey);
 }
 
-.issue_info_data {
+.issue_info_data, .member_data {
   .box-shadow(0px 3px 7px grey);
   text-shadow: none;
   border: 1px solid black;

static/m5s_bs.css

@@ -54,6 +54,7 @@ a{
 }
 .medium_btn  {
     max-width:200px;
+    min-height: 50px;
 }
 .small_btn  {
     max-width:180px;