Skip to content

Commit

Permalink
Merge branch 'develop' into fix/filters-reset-on-reload-new
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ifycode
Ifycode authored Aug 24, 2022
2 parents 8e26fed + fb6b1a2 commit a9ef6be
Show file tree
Hide file tree
Showing 97 changed files with 384 additions and 371 deletions.
3 changes: 3 additions & 0 deletions app/config.js.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ window.ushahidi = {
{% else %}
gaEnabled: false,
{% endif %}
{% if GOOGLE_MAPS_API_KEY %}
googleMapsApiKey: '{{ GOOGLE_MAPS_API_KEY }}',
{% endif %}
{% if GTM_CONTAINER_ID %}
googleTagManager: '{{ GTM_CONTAINER_ID }}',
{% endif %}
Expand Down
34 changes: 17 additions & 17 deletions legacy/app/activity/activity-timeline.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,46 @@ <h1 class="postcard-title"><a href="">Overcrowding between 5th St. &amp; Salem A

<span class="postcard-actions-trigger" data-toggle="dropdown-menu">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
<use xlink:href="#chevron-bottom"></use>
</svg>
</span>
<ul class="dropdown-menu">
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#pencil"></use>
<use xlink:href="#pencil"></use>
</svg>
<span class="label">Edit</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#grid-three-up"></use>
<use xlink:href="#grid-three-up"></use>
</svg>
<span class="label">Add to Collection</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#share"></use>
<use xlink:href="#share"></use>
</svg>
<span class="label">Share</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#task"></use>
<use xlink:href="#task"></use>
</svg>
<span class="label">Assign to...</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#trash"></use>
<use xlink:href="#trash"></use>
</svg>
<span class="label">Delete</span>
</a>
Expand All @@ -83,46 +83,46 @@ <h1 class="postcard-title"><a href="">Overcrowding between 5th St. &amp; Salem A

<span class="postcard-actions-trigger" data-toggle="dropdown-menu">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
<use xlink:href="#chevron-bottom"></use>
</svg>
</span>
<ul class="dropdown-menu">
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#pencil"></use>
<use xlink:href="#pencil"></use>
</svg>
<span class="label">Edit</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#grid-three-up"></use>
<use xlink:href="#grid-three-up"></use>
</svg>
<span class="label">Add to Collection</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#share"></use>
<use xlink:href="#share"></use>
</svg>
<span class="label">Share</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#task"></use>
<use xlink:href="#task"></use>
</svg>
<span class="label">Assign to...</span>
</a>
</li>
<li>
<a href="">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#trash"></use>
<use xlink:href="#trash"></use>
</svg>
<span class="label">Delete</span>
</a>
Expand Down Expand Up @@ -159,7 +159,7 @@ <h1 class="postcard-title"><a href="">Overcrowding between 5th St. &amp; Salem A
<fieldset class="custom-fieldset">
<legend>
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#grid-three-up"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#grid-three-up"></use>
</svg>
Add to Collection
</legend>
Expand All @@ -181,28 +181,28 @@ <h1 class="postcard-title"><a href="">Overcrowding between 5th St. &amp; Salem A

<button type="button">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#external-link"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#external-link"></use>
</svg>
<span class="button-label">Export</span>
</button>

<button type="button" class="button-destructive">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#trash"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#trash"></use>
</svg>
<span class="button-label hidden">Delete</span>
</button>

<button type="button" class="listing-toolbar-toggle more">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#ellipses"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#ellipses"></use>
</svg>
<span class="button-label">Show more</span>
</button>

<button type="button" class="listing-toolbar-toggle less">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#x"></use>
</svg>
<span class="button-label">Show less</span>
</button>
Expand Down
12 changes: 6 additions & 6 deletions legacy/app/activity/activity.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1 class="mode-context-title">

<span class="mode-context-trigger" dropdown-toggle>
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
<use xlink:href="#chevron-bottom"></use>
</svg>
<span class="label hidden" translate>app.show_more_less</span>
</span>
Expand Down Expand Up @@ -71,7 +71,7 @@ <h1 class="mode-context-title">
<svg class="iconic chevron">
<use
xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="/img/iconic-sprite.svg#chevron-bottom"
xlink:href="#chevron-bottom"
></use>
</svg>
</legend>
Expand Down Expand Up @@ -144,7 +144,7 @@ <h1 class="mode-context-title">
<svg class="iconic" role="img">
<use
xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="/img/iconic-sprite.svg#calendar"
xlink:href="#calendar"
></use>
</svg>
<input
Expand Down Expand Up @@ -172,7 +172,7 @@ <h1 class="mode-context-title">
<svg class="iconic" role="img">
<use
xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="/img/iconic-sprite.svg#calendar"
xlink:href="#calendar"
></use>
</svg>
<input
Expand Down Expand Up @@ -223,7 +223,7 @@ <h1 class="mode-context-title">
>
<svg class="iconic" role="img">
<use
xlink:href="/img/iconic-sprite.svg#share"
xlink:href="#share"
></use>
</svg>
<span class="hidden" translate="app.share"
Expand Down Expand Up @@ -259,7 +259,7 @@ <h1 class="mode-context-title">
>
<svg class="iconic" role="img">
<use
xlink:href="/img/iconic-sprite.svg#share"
xlink:href="#share"
></use>
</svg>
<span class="hidden" translate="app.share"
Expand Down
2 changes: 1 addition & 1 deletion legacy/app/activity/bar-chart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span class="legend-label" translate="graph.compare" ng-show="compareIsOpen">Compare...</span>
<span class="legend-label" translate="graph.compare_{{groupBy.value || 'all'}}" ng-hide="compareIsOpen">Compare...</span>
<svg class="iconic chevron">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#chevron-bottom"></use>
</svg>
</legend>

Expand Down
2 changes: 1 addition & 1 deletion legacy/app/activity/time-chart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span class="legend-label" translate="graph.compare" ng-show="compareIsOpen">Compare...</span>
<span class="legend-label" translate="graph.compare_{{groupBy.value || 'all'}}" ng-hide="compareIsOpen">Compare...</span>
<svg class="iconic chevron">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#chevron-bottom"></use>
</svg>
</legend>

Expand Down
9 changes: 9 additions & 0 deletions legacy/app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,14 @@ angular
event.title = title;
window.dispatchEvent(event);
});
}])
.run(['$http', function($http) {
$http.get('https://github.ushahidi.org/platform-pattern-library/assets/img/iconic-sprite.svg').then(function(response) {
console.log('RESPONSE: ', response);
var div = document.createElement('div');
div.innerHTML = response.data;
div.setAttribute('style', 'position: absolute; z-index: -1');
document.body.insertBefore(div, document.body.childNodes[0]);
});
}]);
// .run(require('./gtm-userprops.js'));
2 changes: 1 addition & 1 deletion legacy/app/auth/password-reset-confirm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
ng-show="form.password.$dirty"
class="alert error">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#warning"></use>
</svg>
<p translate="{{'user.valid.password.' + error}}" translate-default="{{error}}"></p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions legacy/app/auth/register.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ng-show="form.full_name.$dirty"
class="alert error">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#warning"></use>
</svg>
<p translate="{{'user.valid.full_name.' + error}}" translate-default="{{error}}"></p>
</div>
Expand All @@ -32,7 +32,7 @@
ng-show="form.email.$dirty"
class="alert error">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#warning"></use>
</svg>
<p translate="{{'user.valid.email.' + error}}" translate-default="{{error}}"></p>
</div>
Expand All @@ -49,7 +49,7 @@
ng-show="form.password.$dirty"
class="alert error">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#warning"></use>
</svg>
<p translate="{{'user.valid.password.' + error}}" translate-default="{{error}}"></p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions legacy/app/common/configs/uib-pagination.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<li ng-if="::directionLinks" ng-class="{disabled: noPrevious()||ngDisabled}" class="prev">
<a ng-click="selectPage(page - 1, $event)">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-left"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#chevron-left"></use>
</svg>
<span class="hidden">Previous</span>
</a>
Expand All @@ -25,7 +25,7 @@
<li ng-if="::directionLinks" ng-class="{disabled: noNext()||ngDisabled}" class="next" >
<a ng-click="selectPage(page + 1, $event)">
<svg class="iconic" role="img">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-right"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#chevron-right"></use>
</svg>
<span class="hidden">Next</span>
</a>
Expand Down
5 changes: 3 additions & 2 deletions legacy/app/common/directives/add-language.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
ng-options="lang.code as lang.name for lang in languagesToSelect"
ng-value="lang.code"
ng-change="selectLanguage(selectedLanguage)"
data-cy="custom-select"
>
<option value="" translate="app.select_language">Select language</option>
</select>
Expand All @@ -18,10 +19,10 @@
</fieldset>
<div ng-show="showLangError" class="alert error">
<svg class="iconic">
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#warning"></use>
</svg>
<p>{{langError}}</p>
</div>
</div>
</div>
<div class="modal-actions">
<div class="form-field">
Expand Down
2 changes: 1 addition & 1 deletion legacy/app/common/directives/mainsheet-container.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<button class="button-beta button-flat mainsheet-trigger-close" ng-show="showCloseButton" ng-click="closeMainsheet()">
<svg class="iconic" role="img">
<!-- TODO: fix icon to be settable -->
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#x"></use>
</svg>
<span class="hidden" translate>modal.button.close</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions legacy/app/common/directives/modal-container.directive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function ModalContainer($timeout, $rootScope, $compile, ModalService, SliderServ
});

var templateScope;
var iconPath = require('ushahidi-platform-pattern-library/assets/img/iconic-sprite.svg');

// Modal content element
var modalContent = $element.find('modal-content');
let trap = FocusTrap.createFocusTrap('.modal-window');
Expand Down Expand Up @@ -71,7 +71,7 @@ function ModalContainer($timeout, $rootScope, $compile, ModalService, SliderServ
trap.activate();
});
$scope.title = title;
$scope.icon = icon ? iconPath + '#' + icon : icon;
$scope.icon = icon ? '#' + icon : icon;

// If closeOnOverlayClick isn't passed, default to true
if (typeof closeOnOverlayClick === 'undefined') {
Expand Down
2 changes: 1 addition & 1 deletion legacy/app/common/directives/modal-container.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<button class="button-beta button-flat modal-trigger modal-trigger-close" ng-show="showCloseButton" ng-click="closeButtonClicked()">
<svg class="iconic" role="img">
<!-- TODO: fix icon to be settable -->
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#x"></use>
</svg>
<span class="hidden" translate>modal.button.close</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion legacy/app/common/directives/modal.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<button class="button-beta button-flat modal-trigger modal-trigger-close" ng-show="showCloseButton" ng-click="closeModal()">
<svg class="iconic" role="img">
<!-- TODO: fix icon to be settable -->
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#x"></use>
</svg>
<span class="hidden" translate>modal.button.close</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions legacy/app/common/directives/modal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ function (
},

controller: ['$scope', '$attrs', '$parse', '$timeout', function ($scope, $attrs, $parse, $timeout) {
$scope.iconPath = $scope.icon ? '/img/iconic-sprite.svg#' + $scope.icon : '';
$scope.iconPath = $scope.icon ? '#' + $scope.icon : '';

var classChangePromise = null;
$scope.iconPath = require('ushahidi-platform-pattern-library/assets/img/iconic-sprite.svg') + '#' + $scope.icon;
$scope.iconPath = '#' + $scope.icon;
$scope.classVisible = false;
$scope.modalOffset = 0;
$scope.title = $translate.instant($scope.title);
Expand Down
4 changes: 2 additions & 2 deletions legacy/app/common/directives/role-selector.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
>
<label for="add_everyone">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#globe"></use>
<use xlink:href="#globe"></use>
</svg>
<input
name="add"
Expand All @@ -34,7 +34,7 @@
>
<label for="add_roles">
<svg class="iconic" role="img">
<use xlink:href="/img/iconic-sprite.svg#people"></use>
<use xlink:href="#people"></use>
</svg>
<input
class="init"
Expand Down
Loading

0 comments on commit a9ef6be

Please sign in to comment.