Merge branch 'master' of gitlab.com:participa/proposal-app

Victor Costa
2 parents b26d7d9b 61160b10
Showing 3 changed files with 78 additions and 20 deletions Show diff stats
index.html
js/main.js
sass/_proposal_detail.scss
@@ -74,19 +74,34 @@
             </div>
             <div class='title'>{{title}}</div> 
             <div class='body'>{{body}}</div>
-            <div class='make-proposal'>
-              <div class='title'>Proponha</div>
-              <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
-                <input id="article_name" name="article[name]" type="text">
-                <textarea id="article_abstract" name="article[abstract]"></textarea>
-                <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
-                <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
-                <input type='submit' id='make-proposal-button'  name='make-proposal-button' value='Submit'>
-              </form>
+            <div class='make-proposal-container'>
+              <div class='make-proposal'>
+                <div class='title'>Faça Uma Proposta</div>
+                <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
+                  <input id="article_name" name="article[name]" type="text">
+                  <textarea id="article_abstract" name="article[abstract]"></textarea>
+                  <label>Título</label>
+                  <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
+                  <label>Descrição</label>
+                  <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
+                  <input type='submit' id='make-proposal-button'  name='make-proposal-button' value='Nova Proposta'>
+                </form>
+              </div>
+            </div>
+            <div class='support-proposal-container'>
+            </div>
+<!--
+            <div class='experience-proposal-container'>
+              <div class='experience-proposal'>
+                <div class='title'>Conte sua experiência</div>
+              </div>
+            </div>
+            <div class='talk-proposal-container'>
+              <div class='talk-proposal'>
+                <div class='title'>Fale com o ministro</div>
+              </div>
             </div>
-            <div class='support-proposal-container'></div>
-            <div class='experience-proposal'>Conte sua experiência</div>
-            <div class='talk-proposal'>Fale com o ministro</div>
+-->
           </div>
         </div>
       {{/each}}
@@ -95,6 +110,7 @@
     <script id='support-proposal-template' type='text/x-handlebars-template'>
       <div class='support-proposal'>
         <div class='title'> Apoie outras propostas</div>
+        <div class='subtitle'> Propostas da sociedade</div>
         <div class='author'>{{author.name}}</div>
         <div class='abstract'>{{abstract}}</div>
         <div class="vote-actions">
@@ -59,6 +59,7 @@ $.getJSON(noosferoAPI)
       $('#proposal-group').hide();
       $('nav').hide();
       $('#content').hide();
+      $(".abstract").dotdotdot();
       $('.proposal-detail').hide();
       $('#' + item).show();
@@ -18,21 +18,62 @@
           weight: bold;
         }
       }
-      .make-proposal{
+      .clear{
+        clear: both;
+      }
+      .make-proposal-container{
         .title{
           color: $color;
+          font-weight: bolder;
+          font-size: x-large;
+          margin: 10px;
+        }
+        width: 50%;
+        height: 200px;
+        float: left;
+        text-align: center;
+        .make-proposal{
+//          border: 1px solid $color;
+          margin: 2% 2% 2% 2%;
+          height: 100%;
         }
-        width: 49%;
-        border: 1px solid $color;
       }
       .support-proposal-container{
-        width: 49%;
+        .title{
+          color: $color;
+          font-weight: bolder;
+          font-size: x-large;
+          margin: 10px;
+        }
+        width: 50%;
+        float: left;
+        height: 200px;
+        text-align: center;
+        .support-proposal{
+//          border: 1px solid $color;
+          height: 100%;
+          margin: 2% 2% 2% 2%;
+        }
       }
-      .experience-proposal{
-        width: 49%;
+      .experience-proposal-container{
+        float: left;
+        width: 50%;
+        height: 200px;
+        .experience-proposal{
+          border: 1px solid $color;
+          margin: 6% 2% 2% 2%;
+          height: 100%;
+        }
       }
-      .talk-proposal{
-        width: 49%;
+      .talk-proposal-container{
+        width: 50%;
+        float: left;
+        height: 200px;
+        .talk-proposal{
+          border: 1px solid $color;
+          margin: 6% 2% 2% 2%;
+          height: 100%;
+        }
       }
       li{
	@@ -74,19 +74,34 @@		@@ -74,19 +74,34 @@
74	</div>	74	</div>
75	<div class='title'>{{title}}</div>	75	<div class='title'>{{title}}</div>
76	<div class='body'>{{body}}</div>	76	<div class='body'>{{body}}</div>
77	- <div class='make-proposal'>
78	- <div class='title'>Proponha</div>
79	- <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
80	- <input id="article_name" name="article[name]" type="text">
81	- <textarea id="article_abstract" name="article[abstract]"></textarea>
82	- <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
83	- <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
84	- <input type='submit' id='make-proposal-button' name='make-proposal-button' value='Submit'>
85	- </form>	77	+ <div class='make-proposal-container'>
		78	+ <div class='make-proposal'>
		79	+ <div class='title'>Faça Uma Proposta</div>
		80	+ <form class='make-proposal-form' id='make-proposal-form-{{id}}'>
		81	+ <input id="article_name" name="article[name]" type="text">
		82	+ <textarea id="article_abstract" name="article[abstract]"></textarea>
		83	+ <label>Título</label>
		84	+ <input id='private_token' name='private_token' value='{{../private_token}}' type='hidden'>
		85	+ <label>Descrição</label>
		86	+ <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Proposal' type='hidden'>
		87	+ <input type='submit' id='make-proposal-button' name='make-proposal-button' value='Nova Proposta'>
		88	+ </form>
		89	+ </div>
		90	+ </div>
		91	+ <div class='support-proposal-container'>
		92	+ </div>
		93	+<!--
		94	+ <div class='experience-proposal-container'>
		95	+ <div class='experience-proposal'>
		96	+ <div class='title'>Conte sua experiência</div>
		97	+ </div>
		98	+ </div>
		99	+ <div class='talk-proposal-container'>
		100	+ <div class='talk-proposal'>
		101	+ <div class='title'>Fale com o ministro</div>
		102	+ </div>
86	</div>	103	</div>
87	- <div class='support-proposal-container'></div>
88	- <div class='experience-proposal'>Conte sua experiência</div>
89	- <div class='talk-proposal'>Fale com o ministro</div>	104	+-->
90	</div>	105	</div>
91	</div>	106	</div>
92	{{/each}}	107	{{/each}}
	@@ -95,6 +110,7 @@		@@ -95,6 +110,7 @@
95	<script id='support-proposal-template' type='text/x-handlebars-template'>	110	<script id='support-proposal-template' type='text/x-handlebars-template'>
96	<div class='support-proposal'>	111	<div class='support-proposal'>
97	<div class='title'> Apoie outras propostas</div>	112	<div class='title'> Apoie outras propostas</div>
		113	+ <div class='subtitle'> Propostas da sociedade</div>
98	<div class='author'>{{author.name}}</div>	114	<div class='author'>{{author.name}}</div>
99	<div class='abstract'>{{abstract}}</div>	115	<div class='abstract'>{{abstract}}</div>
100	<div class="vote-actions">	116	<div class="vote-actions">
	@@ -59,6 +59,7 @@ $.getJSON(noosferoAPI)		@@ -59,6 +59,7 @@ $.getJSON(noosferoAPI)
59	$('#proposal-group').hide();	59	$('#proposal-group').hide();
60	$('nav').hide();	60	$('nav').hide();
61	$('#content').hide();	61	$('#content').hide();
		62	+ $(".abstract").dotdotdot();
62	$('.proposal-detail').hide();	63	$('.proposal-detail').hide();
63	$('#' + item).show();	64	$('#' + item).show();
64		65
	@@ -18,21 +18,62 @@		@@ -18,21 +18,62 @@
18	weight: bold;	18	weight: bold;
19	}	19	}
20	}	20	}
21	- .make-proposal{	21	+ .clear{
		22	+ clear: both;
		23	+ }
		24	+ .make-proposal-container{
22	.title{	25	.title{
23	color: $color;	26	color: $color;
		27	+ font-weight: bolder;
		28	+ font-size: x-large;
		29	+ margin: 10px;
		30	+ }
		31	+ width: 50%;
		32	+ height: 200px;
		33	+ float: left;
		34	+ text-align: center;
		35	+ .make-proposal{
		36	+// border: 1px solid $color;
		37	+ margin: 2% 2% 2% 2%;
		38	+ height: 100%;
24	}	39	}
25	- width: 49%;
26	- border: 1px solid $color;
27	}	40	}
28	.support-proposal-container{	41	.support-proposal-container{
29	- width: 49%;	42	+ .title{
		43	+ color: $color;
		44	+ font-weight: bolder;
		45	+ font-size: x-large;
		46	+ margin: 10px;
		47	+ }
		48	+ width: 50%;
		49	+ float: left;
		50	+ height: 200px;
		51	+ text-align: center;
		52	+ .support-proposal{
		53	+// border: 1px solid $color;
		54	+ height: 100%;
		55	+ margin: 2% 2% 2% 2%;
		56	+ }
30	}	57	}
31	- .experience-proposal{
32	- width: 49%;	58	+ .experience-proposal-container{
		59	+ float: left;
		60	+ width: 50%;
		61	+ height: 200px;
		62	+ .experience-proposal{
		63	+ border: 1px solid $color;
		64	+ margin: 6% 2% 2% 2%;
		65	+ height: 100%;
		66	+ }
33	}	67	}
34	- .talk-proposal{
35	- width: 49%;	68	+ .talk-proposal-container{
		69	+ width: 50%;
		70	+ float: left;
		71	+ height: 200px;
		72	+ .talk-proposal{
		73	+ border: 1px solid $color;
		74	+ margin: 6% 2% 2% 2%;
		75	+ height: 100%;
		76	+ }
36		77
37	}	78	}
38	li{	79	li{