Skip to content

Commit

Permalink
Merge pull request #68 from agoravoting/public-urls
Browse files Browse the repository at this point in the history
Public urls
  • Loading branch information
Findeton authored Sep 20, 2017
2 parents 15fec17 + ab27f8a commit 3a7488a
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 25 deletions.
1 change: 1 addition & 0 deletions app.less
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
@import "avUi/simple-error-directive/simple-error-directive.less";
@import "avUi/change-lang-directive/change-lang-directive.less";
@import "avUi/foot-directive/foot-directive.less";
@import "avUi/documentation-directive/documentation-directive.less";

/* Add Component LESS Above */
@import "../../app.less";
Expand Down
9 changes: 1 addition & 8 deletions avUi/documentation-directive/documentation-directive.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div>
<h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentation.title"></h2>
<p ng-i18next="avDocumentation.documentation.first_line"></p>
<ul>
<ul class="docu-ul">
<li ng-if="!!documentation.faq">
<a
href="{{documentation.faq}}"
Expand Down Expand Up @@ -37,13 +37,6 @@ <h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentat
ng-i18next="avDocumentation.documentation.security_contact">
</a>
</li>
<li>
<a
href="{{legal_url}}"
target="_blank"
ng-i18next="avDocumentation.legal.title">
</a>
</li>
</ul>
<div
class="documentation-html-include"
Expand Down
2 changes: 1 addition & 1 deletion avUi/documentation-directive/documentation-directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ angular.module('avUi').controller('DocumentationUiController',
$scope.documentation.security_contact = ConfigService.legal.security_contact;
$scope.documentation_html_include = $sce.trustAsHtml(ConfigService.documentation_html_include);
$scope.auths_url = '/election/' + $stateParams.id + '/public/authorities';
$scope.legal_url = '/election/' + $stateParams.id + '/public/legal';
$scope.election_id = $stateParams.id + '';

Authmethod.viewEvent($stateParams.id)
.success(function(data) {
Expand Down
6 changes: 6 additions & 0 deletions avUi/documentation-directive/documentation-directive.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[documentation-directive] {
.docu-ul {
margin-bottom: 0px;
}
}
10 changes: 5 additions & 5 deletions avUi/foot-directive/foot-directive.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
ng-i18next="[html:i18next]({url: organization.orgUrl, name: organization.orgName})avCommon.poweredBy"
>
</span>
<a href="{{social.facebook}}" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a>
<a href="{{social.twitter}}" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a>
<a href="{{social.googleplus}}" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a>
<a href="{{social.youtube}}" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a>
<a href="{{social.github}}" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a>
<a href="{{social.facebook}}" target="_blank" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a>
<a href="{{social.twitter}}" target="_blank" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a>
<a href="{{social.googleplus}}" target="_blank" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a>
<a href="{{social.youtube}}" target="_blank" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a>
<a href="{{social.github}}" target="_blank" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a>
</div>
</div>
6 changes: 3 additions & 3 deletions dist/appCommon-v103111.5.js
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ angular.module("avRegistration").factory("Authmethod", [ "$http", "$cookies", "C
} ]), angular.module("avUi").controller("DocumentationUiController", [ "$state", "$stateParams", "$http", "$scope", "$sce", "$i18next", "ConfigService", "InsideIframeService", "Authmethod", function($state, $stateParams, $http, $scope, $sce, $i18next, ConfigService, InsideIframeService, Authmethod) {
$scope.inside_iframe = InsideIframeService(), $scope.documentation = ConfigService.documentation,
$scope.documentation.security_contact = ConfigService.legal.security_contact, $scope.documentation_html_include = $sce.trustAsHtml(ConfigService.documentation_html_include),
$scope.auths_url = "/election/" + $stateParams.id + "/public/authorities", $scope.legal_url = "/election/" + $stateParams.id + "/public/legal",
$scope.auths_url = "/election/" + $stateParams.id + "/public/authorities", $scope.election_id = $stateParams.id + "",
Authmethod.viewEvent($stateParams.id).success(function(data) {
"ok" === data.status && ($scope.authEvent = data.events);
});
Expand Down Expand Up @@ -1095,8 +1095,8 @@ angular.module("jm.i18next").config([ "$i18nextProvider", "ConfigServiceProvider
$templateCache.put("avRegistration/register-directive/register-directive.html", '<div class="container"><div class="row"><div class="col-sm-12"><h2 ng-if="!admin" class="registerheader" ng-i18next="avRegistration.registerHeader"></h2><h2 ng-if="admin" class="registerheader" ng-i18next="avRegistration.registerAdminHeader"></h2></div></div><div class="row"><div class="col-sm-6"><div ng-if="method == \'dnie\'"><a type="submit" class="btn btn-block btn-success" ng-i18next="avRegistration.registerButton" ng-href="{{ dnieurl }}/"></a></div><form ng-if="method != \'dnie\'" name="form" id="registerForm" role="form" class="form-horizontal"><div ng-repeat="field in register_fields" avr-field index="{{$index+1}}"></div><div class="col-sm-offset-4 col-sm-8 button-group"><div class="input-error"><div class="error text-danger" ng-if="error" ng-bind-html="error"></div></div><div class="input-warn"><span class="text-warning" ng-if="!form.$valid || sendingData" ng-i18next>avRegistration.fillValidFormText</span></div><button type="submit" class="btn btn-block btn-success" ng-i18next="avRegistration.registerButton" ng-click="signUp(form.$valid)" tabindex="{{register_fields.length+1}}" ng-disabled="!form.$valid || sendingData"></button></div></form></div><div class="col-sm-5 col-sm-offset-1 help-sidebar hidden-xs"><span><h3 class="help-h3" ng-i18next="avRegistration.registerAdminFormHelpTitle"></h3><p ng-i18next>avRegistration.helpAdminRegisterForm</p></span> <span><p ng-if="!admin" ng-i18next>avRegistration.helpRegisterForm</p><h3 class="help-h3" ng-i18next="avRegistration.alreadyRegistered"></h3><p ng-i18next>[html]avRegistration.helpAlreadyRegisteredForm</p><a href="" ng-click="goLogin($event)" ng-i18next="avRegistration.loginHere"></a><br></span></div></div></div>'),
$templateCache.put("avRegistration/success.html", '<div av-success><p ng-i18next="avRegistration.successRegistration"></p></div>'),
$templateCache.put("avUi/change-lang-directive/change-lang-directive.html", '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ deflang }} <span class="caret"></span></a><ul class="dropdown-menu" role="menu"><li ng-repeat="lang in langs"><a ng-click="changeLang(lang)">{{lang}}</a></li></ul>'),
$templateCache.put("avUi/documentation-directive/documentation-directive.html", '<div><h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentation.title"></h2><p ng-i18next="avDocumentation.documentation.first_line"></p><ul><li ng-if="!!documentation.faq"><a href="{{documentation.faq}}" target="_blank" ng-i18next="avDocumentation.documentation.faq"></a></li><li ng-if="!!documentation.overview"><a href="{{documentation.overview}}" target="_blank" ng-i18next="avDocumentation.documentation.overview"></a></li><li><a href="{{auths_url}}" target="_blank" ng-i18next="avDocumentation.documentation.authorities"></a></li><li ng-if="!!documentation.technical"><a href="{{documentation.technical}}" target="_blank" ng-i18next="avDocumentation.documentation.technical"></a></li><li ng-if="!!documentation.security_contact"><a href="{{documentation.security_contact}}" target="_blank" ng-i18next="avDocumentation.documentation.security_contact"></a></li><li><a href="{{legal_url}}" target="_blank" ng-i18next="avDocumentation.legal.title"></a></li></ul><div class="documentation-html-include" av-plugin-html ng-bind-html="documentation_html_include"></div></div>'),
$templateCache.put("avUi/foot-directive/foot-directive.html", '<div class="commonfoot"><div class="social" style="text-align: center"><span class="powered-by pull-left" ng-i18next="[html:i18next]({url: organization.orgUrl, name: organization.orgName})avCommon.poweredBy"></span> <a href="{{social.facebook}}" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a> <a href="{{social.twitter}}" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a> <a href="{{social.googleplus}}" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a> <a href="{{social.youtube}}" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a> <a href="{{social.github}}" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a></div></div>'),
$templateCache.put("avUi/documentation-directive/documentation-directive.html", '<div><h2 class="text-center text-av-secondary" ng-i18next="avDocumentation.documentation.title"></h2><p ng-i18next="avDocumentation.documentation.first_line"></p><ul class="docu-ul"><li ng-if="!!documentation.faq"><a href="{{documentation.faq}}" target="_blank" ng-i18next="avDocumentation.documentation.faq"></a></li><li ng-if="!!documentation.overview"><a href="{{documentation.overview}}" target="_blank" ng-i18next="avDocumentation.documentation.overview"></a></li><li><a href="{{auths_url}}" target="_blank" ng-i18next="avDocumentation.documentation.authorities"></a></li><li ng-if="!!documentation.technical"><a href="{{documentation.technical}}" target="_blank" ng-i18next="avDocumentation.documentation.technical"></a></li><li ng-if="!!documentation.security_contact"><a href="{{documentation.security_contact}}" target="_blank" ng-i18next="avDocumentation.documentation.security_contact"></a></li></ul><div class="documentation-html-include" av-plugin-html ng-bind-html="documentation_html_include"></div></div>'),
$templateCache.put("avUi/foot-directive/foot-directive.html", '<div class="commonfoot"><div class="social" style="text-align: center"><span class="powered-by pull-left" ng-i18next="[html:i18next]({url: organization.orgUrl, name: organization.orgName})avCommon.poweredBy"></span> <a href="{{social.facebook}}" target="_blank" ng-if="!!social.facebook"><i class="fa fa-fw fa-lg fa-facebook"></i></a> <a href="{{social.twitter}}" target="_blank" ng-if="!!social.twitter"><i class="fa fa-fw fa-lg fa-twitter"></i></a> <a href="{{social.googleplus}}" target="_blank" ng-if="!!social.googleplus"><i class="fa fa-fw fa-lg fa-google-plus"></i></a> <a href="{{social.youtube}}" target="_blank" ng-if="!!social.youtube"><i class="fa fa-fw fa-lg fa-youtube-play"></i></a> <a href="{{social.github}}" target="_blank" ng-if="!!social.github"><i class="fa fa-fw fa-lg fa-github"></i></a></div></div>'),
$templateCache.put("avUi/simple-error-directive/simple-error-directive.html", '<div class="av-simple-error-title" ng-transclude></div>'),
$templateCache.put("test/test_booth_widget.html", '<!DOCTYPE html><html><head><title>Test frame</title><meta charset="UTF-8"></head><script>function getCastHmac(auth_data, callback) {\n callback("khmac:///sha-256;5e25a9af28a33d94b8c2c0edbc83d6d87355e45b93021c35a103821557ec7dc5/voter-1110-1dee0c135afeae29e208550e7258dab7b64fb008bc606fc326d41946ab8e773f:1415185712");\n }<\/script><body style="overflow-y: hidden; overflow-x: hidden; padding: 0; margin: 0"><div style="width: 100%; display: block; position: absolute; top: 0; bottom: 0; scroll: none; padding: 0; margin: 0"><a class="agoravoting-voting-booth" href="http://agora.dev/#/election/1110/vote" data-authorization-funcname="getCastHmac">Votar con Agora Voting</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://agora.dev/avWidgets.min.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","agoravoting-widgets-js");<\/script></div></body></html>'),
$templateCache.put("test/unit_test_e2e.html", '<div dynamic="html" id="dynamic-result"></div>');
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[documentation-directive] {
.docu-ul {
margin-bottom: 0px;
}
}
2 changes: 1 addition & 1 deletion dist/themes/bcnencomu/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/cup/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/default/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/diba/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/ebcn/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/loop/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/podemos/app.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/themes/test/app.min.css

Large diffs are not rendered by default.

0 comments on commit 3a7488a

Please sign in to comment.