Merge branch 'fix-issues'

Leonardo Merlin
2 parents 509d09ff c89c3d7d
Showing 5 changed files with 24 additions and 6 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/cadastro-proposta/cadastro-proposta.html
src/app/components/proposal-carousel/proposal-carousel.html
src/app/pages/programas/programas.scss
src/app/pages/ranking/ranking.controller.js
@@ -13,6 +13,7 @@
       apiArticles: $rootScope.basePath + '/api/v1/articles/',
       apiCommunities: $rootScope.basePath + '/api/v1/communities/',
       apiProposals: $rootScope.basePath + '/api/v1/proposals_discussion_plugin/',
+      apiSearch: $rootScope.basePath + '/api/v1/search/',
       getArticleById: getArticleById,
       getArticleBySlug: getArticleBySlug,
       getCategories: getCategories,
@@ -234,7 +235,7 @@
  
     function searchTopics (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
-      var url = '/api/v1/search/article';
+      var url = service.apiSearch + '/article';
       var paramsExtended = angular.extend({
         // 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
         'type': 'ProposalsDiscussionPlugin::Topic'
@@ -249,7 +250,7 @@
  
     function searchProposals (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
-      var url = '/api/v1/search/article';
+      var url = service.apiSearch + '/article';
       var paramsExtended = angular.extend({
         page: 1,
         per_page: 20,
@@ -21,10 +21,16 @@
 				<div class="col-sm-8">
 					<label for="proposta-textarea">Descrição da proposta*</label>
 					<a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
-					<textarea id="proposta-textarea" name="proposta" class="texto-proposta form-control"
+					<textarea
+					id="proposta-textarea"
+					name="proposta"
+					class="texto-proposta form-control"
 					ng-class="{ 'has-error' : formPropostas.proposta.$invalid && formPropostas.proposta.$touched }"
 					ng-model="proposta"
-					required ng-maxlength="200" ></textarea>
+					ng-trim="false"
+					ng-maxlength="200"
+					maxlength="200"
+					required></textarea>
 					<validation-messages field="formPropostas.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"></validation-messages>
 					<div class="row">
 						<div class="col-xs-6">
@@ -32,6 +38,7 @@
 						</div>
 						<div class="col-xs-6 text-right">
 							<span>Máx. 200 caracteres</span>
+							<span ng-if="proposta.length > 0">(restam {{(200 - proposta.length)}} caracteres)</span>
 						</div>
 					</div>
 				</div>
@@ -8,7 +8,7 @@
       <div class="proposal-carousel-top-triggers" ng-if="vm.proposals">
         <ul class="list-inline">
           <li class="item-dot" ng-repeat="proposal in vm.proposals">
-            <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta na posição {{$index}}"></button>
+            <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta {{ ( $index + 1 ) }}"></button>
           </li>
         </ul>
       </div>
@@ -81,9 +81,19 @@
         .program-preview--share {
             margin-bottom: 20px;
             position: relative;
+            
             .dropdown {
                 display: inline-block;
                 position: relative;
+
+                @media screen and (max-width: $screen-xs) {
+                    display: block;
+
+                    .dropdown-menu-right {
+                        left: 0;
+                        right: auto;
+                    }
+                }
             }
  
             .dropdown-menu {
@@ -28,7 +28,7 @@
     var vm = this;
  
     vm.page = 1;
-    vm.per_page = 20;
+    vm.per_page = 10;
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredPrograms = null;
...	...	@@ -13,6 +13,7 @@
13	13	apiArticles: $rootScope.basePath + '/api/v1/articles/',
14	14	apiCommunities: $rootScope.basePath + '/api/v1/communities/',
15	15	apiProposals: $rootScope.basePath + '/api/v1/proposals_discussion_plugin/',
	16	+ apiSearch: $rootScope.basePath + '/api/v1/search/',
16	17	getArticleById: getArticleById,
17	18	getArticleBySlug: getArticleBySlug,
18	19	getCategories: getCategories,
...	...	@@ -234,7 +235,7 @@
234	235
235	236	function searchTopics (params, cbSuccess, cbError) {
236	237	// Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
237		- var url = '/api/v1/search/article';
	238	+ var url = service.apiSearch + '/article';
238	239	var paramsExtended = angular.extend({
239	240	// 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
240	241	'type': 'ProposalsDiscussionPlugin::Topic'
...	...	@@ -249,7 +250,7 @@
249	250
250	251	function searchProposals (params, cbSuccess, cbError) {
251	252	// Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
252		- var url = '/api/v1/search/article';
	253	+ var url = service.apiSearch + '/article';
253	254	var paramsExtended = angular.extend({
254	255	page: 1,
255	256	per_page: 20,
...	...
...	...	@@ -21,10 +21,16 @@
21	21	<div class="col-sm-8">
22	22	<label for="proposta-textarea">Descrição da proposta*</label>
23	23	<a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
24		- <textarea id="proposta-textarea" name="proposta" class="texto-proposta form-control"
	24	+ <textarea
	25	+ id="proposta-textarea"
	26	+ name="proposta"
	27	+ class="texto-proposta form-control"
25	28	ng-class="{ 'has-error' : formPropostas.proposta.$invalid && formPropostas.proposta.$touched }"
26	29	ng-model="proposta"
27		- required ng-maxlength="200" ></textarea>
	30	+ ng-trim="false"
	31	+ ng-maxlength="200"
	32	+ maxlength="200"
	33	+ required></textarea>
28	34	<validation-messages field="formPropostas.proposta" maxlength="'Ops, esse campo não pode ser maior que 200 caracteres.'"></validation-messages>
29	35	<div class="row">
30	36	<div class="col-xs-6">
...	...	@@ -32,6 +38,7 @@
32	38	</div>
33	39	<div class="col-xs-6 text-right">
34	40	<span>Máx. 200 caracteres</span>
	41	+ <span ng-if="proposta.length > 0">(restam {{(200 - proposta.length)}} caracteres)</span>
35	42	</div>
36	43	</div>
37	44	</div>
...	...
...	...	@@ -8,7 +8,7 @@
8	8	<div class="proposal-carousel-top-triggers" ng-if="vm.proposals">
9	9	<ul class="list-inline">
10	10	<li class="item-dot" ng-repeat="proposal in vm.proposals">
11		- <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta na posição {{$index}}"></button>
	11	+ <button type="button" ng-class="{'active': vm.activeIndex === $index}" ng-click="vm.switchProposal($index)" title="Apersentar proposta {{ ( $index + 1 ) }}"></button>
12	12	</li>
13	13	</ul>
14	14	</div>
...	...
...	...	@@ -81,9 +81,19 @@
81	81	.program-preview--share {
82	82	margin-bottom: 20px;
83	83	position: relative;
	84	+
84	85	.dropdown {
85	86	display: inline-block;
86	87	position: relative;
	88	+
	89	+ @media screen and (max-width: $screen-xs) {
	90	+ display: block;
	91	+
	92	+ .dropdown-menu-right {
	93	+ left: 0;
	94	+ right: auto;
	95	+ }
	96	+ }
87	97	}
88	98
89	99	.dropdown-menu {
...	...
...	...	@@ -28,7 +28,7 @@
28	28	var vm = this;
29	29
30	30	vm.page = 1;
31		- vm.per_page = 20;
	31	+ vm.per_page = 10;
32	32	vm.themes = null;
33	33	vm.selectedTheme = null;
34	34	vm.filtredPrograms = null;
...	...