Download as
Browse Code »

Commit 5b4c9b485f44d73c90b0b777f184367ca68c836e

Authored by Leonardo Merlin
1 parent c2fa23f0
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Do not limit width of article content

Showing 2 changed files with 32 additions and 18 deletions   Show diff stats
src/app/pages/article/article.controller.js
  Diff comments   View file @5b4c9b4
@@ -7,15 +7,17 @@ @@ -7,15 +7,17 @@
7 7
8 /** @ngInject */ 8 /** @ngInject */
9 function ArticlePageController(DialogaService, $state, $sce, $log) { 9 function ArticlePageController(DialogaService, $state, $sce, $log) {
10 - $log.debug('ArticlePageController');  
11 -  
12 var vm = this; 10 var vm = this;
  11 +
13 vm.DialogaService = DialogaService; 12 vm.DialogaService = DialogaService;
14 vm.$state = $state; 13 vm.$state = $state;
15 vm.$sce = $sce; 14 vm.$sce = $sce;
16 vm.$log = $log; 15 vm.$log = $log;
17 16
18 vm.init(); 17 vm.init();
  18 + vm.loadData();
  19 +
  20 + vm.$log.debug('ArticlePageController');
19 } 21 }
20 22
21 ArticlePageController.prototype.init = function() { 23 ArticlePageController.prototype.init = function() {
@@ -24,6 +26,13 @@ @@ -24,6 +26,13 @@
24 vm.page = vm.$state.current.name; 26 vm.page = vm.$state.current.name;
25 vm.article = null; 27 vm.article = null;
26 vm.loading = true; 28 vm.loading = true;
  29 +
  30 + vm.$log.debug('vm.page', vm.page);
  31 + };
  32 +
  33 + ArticlePageController.prototype.loadData = function() {
  34 + var vm = this;
  35 +
27 switch (vm.page){ 36 switch (vm.page){
28 case 'sobre': 37 case 'sobre':
29 vm.DialogaService.getAbout(handleSuccess, handleError); 38 vm.DialogaService.getAbout(handleSuccess, handleError);
@@ -43,8 +52,10 @@ @@ -43,8 +52,10 @@
43 } 52 }
44 53
45 function handleError (error) { 54 function handleError (error) {
  55 + vm.$log.debug('handleSuccess.error', error);
46 vm.loading = false; 56 vm.loading = false;
47 vm.error = error; 57 vm.error = error;
48 } 58 }
49 }; 59 };
  60 +
50 })(); 61 })();
src/app/pages/article/article.html
  Diff comments   View file @5b4c9b4
@@ -7,25 +7,28 @@ @@ -7,25 +7,28 @@
7 </div> 7 </div>
8 8
9 <div class="container" role="main"> 9 <div class="container" role="main">
10 -  
11 - <div ng-if="pageArticle.loading">  
12 - <div class="alert alert-info">  
13 - Carregando conteúdo... 10 + <div class="row">
  11 + <div ng-if="pageArticle.loading">
  12 + <div class="alert alert-info">
  13 + Carregando conteúdo...
  14 + </div>
14 </div> 15 </div>
15 - </div>  
16 16
17 - <div ng-if="pageArticle.error">  
18 - <div class="alert alert-info">  
19 - Erro ao carregar conteúdo. 17 + <div ng-if="pageArticle.error">
  18 + <div class="alert alert-info">
  19 + Erro ao carregar conteúdo.
  20 + </div>
20 </div> 21 </div>
21 </div> 22 </div>
  23 +</div>
22 24
23 - <div ng-if="pageArticle.article">  
24 - <article>  
25 - <header>  
26 - <h1>{{::pageArticle.article.title}}</h1>  
27 - </header>  
28 - <section ng-bind-html="pageArticle.article.body"></section>  
29 - </article>  
30 - </div> 25 +<div ng-if="pageArticle.article">
  26 + <article>
  27 + <header class="container">
  28 + <div class="row">
  29 + <h1>{{::pageArticle.article.title}}</h1>
  30 + </div>
  31 + </header>
  32 + <div ng-bind-html="pageArticle.article.body"></div>
  33 + </article>
31 </div> 34 </div>