Download as
Browse Code »

Commit 7c8b0fdcc44f0c3fd531b753b1e1cd6093b90636

Authored by Leonardo Merlin
1 parent 24cc0cef
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

Switch header and footer views to directives

Showing 12 changed files with 103 additions and 103 deletions   Show diff stats
src/app/components/app-footer/app-footer.directive.js 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,17 @@
  1 +(function() {
  2 + 'use strict';
  3 +
  4 + angular
  5 + .module('dialoga')
  6 + .directive('appFooter', appFooter);
  7 +
  8 + /** @ngInject */
  9 + function appFooter() {
  10 + var directive = {
  11 + restrict: 'E',
  12 + templateUrl: 'app/components/app-footer/app-footer.html'
  13 + };
  14 +
  15 + return directive;
  16 + }
  17 +})();
... ...
src/app/components/app-footer/app-footer.html 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,10 @@
  1 +<div id="footer">
  2 + <div class="container">
  3 + <div class="row">
  4 + <div class="col-xs-12 text-center">
  5 + <a id="termos-de-uso" ui-sref="termos-de-uso">Termos de uso</a>
  6 + <a href="#header" style="position:absolute;right:0;top:-10px;" ng-click="scrollTo('#header')">Voltar para o topo</a>
  7 + </div>
  8 + </div>
  9 + </div>
  10 +</div>
... ...
src/app/components/app-footer/app-footer.scss 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,21 @@
  1 +$barra-theme: ("green": #00420c, "yellow": #2c66ce, "blue": #0042b1);
  2 +
  3 +#footer-brasil {
  4 + background: none repeat scroll 0% 0% map-get($barra-theme, "blue");
  5 + padding: 1em 0px;
  6 + max-width: 100%;
  7 +}
  8 +
  9 +#footer {
  10 + padding: 20px 0;
  11 + a {
  12 + margin: 10px auto;
  13 + }
  14 +
  15 + .contraste & {
  16 + background-color: #000;
  17 + a {
  18 + color: #fff;
  19 + }
  20 + }
  21 +}
... ...
src/app/components/app-header/app-header.directive.js 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,17 @@
  1 +(function() {
  2 + 'use strict';
  3 +
  4 + angular
  5 + .module('dialoga')
  6 + .directive('appHeader', appHeader);
  7 +
  8 + /** @ngInject */
  9 + function appHeader() {
  10 + var directive = {
  11 + restrict: 'E',
  12 + templateUrl: 'app/components/app-header/app-header.html'
  13 + };
  14 +
  15 + return directive;
  16 + }
  17 +})();
... ...
src/app/components/app-header/app-header.html 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,15 @@
  1 +<header id="header" class="container">
  2 +
  3 + <div class="row hidden-xs">
  4 + <div class="col-sm-12">
  5 + <auth-user></auth-user>
  6 + </div>
  7 + </div>
  8 +
  9 + <div class="row">
  10 + <div class="col-sm-12">
  11 + <app-navbar></app-navbar>
  12 + </div>
  13 + </div>
  14 +
  15 +</header>
... ...
src/app/components/app-header/app-header.scss 0 → 100644
  Diff comments   View file @7c8b0fd
... ... @@ -0,0 +1,6 @@
  1 +// #header {
  2 +
  3 +// @media (max-width: $screen-md) {
  4 +
  5 +// }
  6 +// }
0 7 \ No newline at end of file
... ...
src/app/index.route.js
  Diff comments   View file @7c8b0fd
... ... @@ -13,65 +13,55 @@
13 13 ncyBreadcrumb: {label: 'Home'},
14 14 reloadOnSearch: false,
15 15 views: {
16   - 'header': { templateUrl: 'app/pages/header/header.html' },
17 16 'main': {
18 17 templateUrl: 'app/pages/inicio/inicio.html',
19 18 controller: 'InicioPageController',
20 19 controllerAs: 'pageInicio'
21   - },
22   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  20 + }
23 21 }
24 22 })
25 23 .state('entrar', {
26 24 url: '/entrar?redirect_uri&message',
27 25 ncyBreadcrumb: {label: 'Entrar'},
28 26 views: {
29   - 'header': { templateUrl: 'app/pages/header/header.html' },
30 27 'main': {
31 28 templateUrl: 'app/pages/auth/signin.html',
32 29 controller: 'AuthPageController',
33 30 controllerAs: 'pageSignin'
34   - },
35   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  31 + }
36 32 }
37 33 })
38 34 .state('recuperar', {
39 35 url: '/recuperar',
40 36 ncyBreadcrumb: {label: 'Recuperar'},
41 37 views: {
42   - 'header': { templateUrl: 'app/pages/header/header.html' },
43 38 'main': {
44 39 templateUrl: 'app/pages/auth/recover.html',
45 40 controller: 'AuthPageController',
46 41 controllerAs: 'pageSignin'
47   - },
48   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  42 + }
49 43 }
50 44 })
51 45 .state('alterar', {
52 46 url: '/alterar',
53 47 ncyBreadcrumb: {label: 'Alterar'},
54 48 views: {
55   - 'header': { templateUrl: 'app/pages/header/header.html' },
56 49 'main': {
57 50 templateUrl: 'app/pages/auth/change.html',
58 51 controller: 'AuthPageController',
59 52 controllerAs: 'pageSignin'
60   - },
61   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  53 + }
62 54 }
63 55 })
64 56 .state('cadastrar', {
65 57 url: '/cadastrar',
66 58 ncyBreadcrumb: {label: 'Cadastrar'},
67 59 views: {
68   - 'header': { templateUrl: 'app/pages/header/header.html' },
69 60 'main': {
70 61 templateUrl: 'app/pages/auth/signup.html',
71 62 controller: 'AuthPageController',
72 63 controllerAs: 'pageSignup'
73   - },
74   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  64 + }
75 65 }
76 66 })
77 67 .state('programas', {
... ... @@ -79,13 +69,11 @@
79 69 reloadOnSearch: false,
80 70 ncyBreadcrumb: {label: 'Programas'},
81 71 views: {
82   - 'header': { templateUrl: 'app/pages/header/header.html' },
83 72 'main': {
84 73 templateUrl: 'app/pages/programas/programas.html',
85 74 controller: 'ProgramasPageController',
86 75 controllerAs: 'pageProgramas'
87   - },
88   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  76 + }
89 77 }
90 78 })
91 79 .state('programa', {
... ... @@ -96,13 +84,11 @@
96 84 parent: 'programas'
97 85 },
98 86 views: {
99   - 'header': { templateUrl: 'app/pages/header/header.html' },
100 87 'main': {
101 88 templateUrl: 'app/pages/programas/programa.html',
102 89 controller: 'ProgramaPageController',
103 90 controllerAs: 'pagePrograma'
104   - },
105   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  91 + }
106 92 }
107 93 })
108 94 .state('propostas', {
... ... @@ -110,13 +96,11 @@
110 96 reloadOnSearch: false,
111 97 ncyBreadcrumb: {label: 'Propostas'},
112 98 views: {
113   - 'header': { templateUrl: 'app/pages/header/header.html' },
114 99 'main': {
115 100 templateUrl: 'app/pages/propostas/propostas.html',
116 101 controller: 'PropostasPageController',
117 102 controllerAs: 'pagePropostas'
118   - },
119   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  103 + }
120 104 }
121 105 })
122 106 .state('ranking', {
... ... @@ -124,13 +108,11 @@
124 108 reloadOnSearch: false,
125 109 ncyBreadcrumb: {label: 'Propostas'},
126 110 views: {
127   - 'header': { templateUrl: 'app/pages/header/header.html' },
128 111 'main': {
129 112 templateUrl: 'app/pages/propostas/ranking.html',
130 113 controller: 'PropostasPageController',
131 114 controllerAs: 'pagePropostas'
132   - },
133   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  115 + }
134 116 }
135 117 })
136 118 .state('propostas-conteudo', {
... ... @@ -140,39 +122,33 @@
140 122 parent: 'propostas'
141 123 },
142 124 views: {
143   - 'header': { templateUrl: 'app/pages/header/header.html' },
144 125 'main': {
145 126 templateUrl: 'app/pages/propostas/proposta.html',
146 127 controller: 'PropostasPageController',
147 128 controllerAs: 'pagePropostas'
148   - },
149   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  129 + }
150 130 }
151 131 })
152 132 .state('duvidas', {
153 133 url: '/duvidas',
154 134 ncyBreadcrumb: {label: 'Dúvidas'},
155 135 views: {
156   - 'header': { templateUrl: 'app/pages/header/header.html' },
157 136 'main': {
158 137 templateUrl: 'app/pages/duvidas/duvidas.html',
159 138 controller: 'DuvidasPageController',
160 139 controllerAs: 'pageDuvidas'
161   - },
162   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  140 + }
163 141 }
164 142 })
165 143 .state('sobre', {
166 144 url: '/sobre',
167 145 ncyBreadcrumb: {label: 'Sobre'},
168 146 views: {
169   - 'header': { templateUrl: 'app/pages/header/header.html' },
170 147 'main': {
171 148 templateUrl: 'app/pages/article/article.html',
172 149 controller: 'ArticlePageController',
173 150 controllerAs: 'pageArticle'
174   - },
175   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  151 + }
176 152 }
177 153 })
178 154 .state('termos-de-uso', {
... ... @@ -180,35 +156,29 @@
180 156 ncyBreadcrumb: {label: 'Termos de Uso'},
181 157 controller: 'ArticlePageController',
182 158 views: {
183   - 'header': { templateUrl: 'app/pages/header/header.html' },
184 159 'main': {
185 160 templateUrl: 'app/pages/article/article.html',
186 161 controller: 'ArticlePageController',
187 162 controllerAs: 'pageArticle'
188   - },
189   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  163 + }
190 164 }
191 165 })
192 166 .state('mapa-do-site', {
193 167 url: '/mapa-do-site',
194 168 ncyBreadcrumb: {label: 'Mapa do Site'},
195 169 views: {
196   - 'header': { templateUrl: 'app/pages/header/header.html' },
197 170 'main': {
198 171 templateUrl: 'app/pages/mapa-do-site/mapa-do-site.html',
199 172 controller: 'SitemapPageController',
200 173 controllerAs: 'sitemap'
201   - },
202   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  174 + }
203 175 }
204 176 })
205 177 .state('erro', {
206 178 url: '/erro',
207 179 ncyBreadcrumb: {label: 'Erro'},
208 180 views: {
209   - 'header': { templateUrl: 'app/pages/header/header.html' },
210   - 'main': { templateUrl: 'app/pages/erro/erro.html' },
211   - 'footer': { templateUrl: 'app/pages/footer/footer.html' }
  181 + 'main': { templateUrl: 'app/pages/erro/erro.html' }
212 182 }
213 183 })
214 184 ;
... ...
src/app/pages/footer/footer.html
View file @24cc0ce
... ... @@ -1,10 +0,0 @@
1   -<div id="footer">
2   - <div class="container">
3   - <div class="row">
4   - <div class="col-xs-12 text-center">
5   - <a id="termos-de-uso" ui-sref="termos-de-uso">Termos de uso</a>
6   - <a href="#header" style="position:absolute;right:0;top:-10px;" ng-click="scrollTo('#header')">Voltar para o topo</a>
7   - </div>
8   - </div>
9   - </div>
10   -</div>
src/app/pages/footer/footer.scss
View file @24cc0ce
... ... @@ -1,21 +0,0 @@
1   -$barra-theme: ("green": #00420c, "yellow": #2c66ce, "blue": #0042b1);
2   -
3   -#footer-brasil {
4   - background: none repeat scroll 0% 0% map-get($barra-theme, "blue");
5   - padding: 1em 0px;
6   - max-width: 100%;
7   -}
8   -
9   -#footer {
10   - padding: 20px 0;
11   - a {
12   - margin: 10px auto;
13   - }
14   -
15   - .contraste & {
16   - background-color: #000;
17   - a {
18   - color: #fff;
19   - }
20   - }
21   -}
src/app/pages/header/header.html
View file @24cc0ce
... ... @@ -1,20 +0,0 @@
1   -<header id="header" class="container">
2   -
3   - <div class="row hidden-xs">
4   - <div class="col-sm-12">
5   - <auth-user></auth-user>
6   - </div>
7   - </div>
8   -
9   - <div class="row">
10   - <div class="col-sm-12">
11   - <app-navbar></app-navbar>
12   - </div>
13   - </div>
14   -
15   - <!-- <div class="row">
16   - <div class="col-sm-12">
17   - <div ncy-breadcrumb></div>
18   - </div>
19   - </div> -->
20   -</header>
src/app/pages/header/header.scss
View file @24cc0ce
... ... @@ -1,6 +0,0 @@
1   -#header {
2   -
3   - @media (max-width: $screen-md) {
4   -
5   - }
6   -}
7 0 \ No newline at end of file
src/index.html
  Diff comments   View file @7c8b0fd
... ... @@ -37,7 +37,8 @@
37 37 <p class="browsehappy">Você está usando um navegador <strong>antigo</strong>. Por favor, <a href="http://browsehappy.com/">atualize o navegador</a> para melhorar a experiência de uso.</p>
38 38 <![endif]-->
39 39  
40   - <div ui-view="header"></div>
  40 + <app-header></app-header>
  41 +
41 42 <div id="content" ui-view="main"></div>
42 43 <div ui-view="footer"></div>
43 44  
... ...