Skip to content

Ios cosmetic fix #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomatell wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Ios cosmetic fix #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
717e5e6
[FINISHED #101593698] Mobile - add banners of instances from scan
tomatell Sep 4, 2015
0c9f7c5
[FINISHED #102668720] Mobile - adding back button feature from the se…
tomatell Sep 10, 2015
b5a1f38
[FINISHED #103104920] Adding mobile directive to the server client
tomatell Sep 11, 2015
28e4be3
[FIXED #103744988] - Fix glyphicon vs fa icons issue
tomatell Sep 24, 2015
1687fe1
[FIXED #103201668] Mobile - login button covers rememberMe when the s…
tomatell Sep 24, 2015
d03abfc
[FIXED #101418346] Cursor on Action in the row header on Search Pers…
tomatell Sep 24, 2015
97dbb8b
[FIXED #103782994] remember me send user always to dashboar even conf…
tomatell Sep 24, 2015
d3d6c2c
[FIXED #103748012] missing icons for buttons
tomatell Sep 29, 2015
c1e2659
Just for checking a new logo.
tomatell Oct 1, 2015
b43131c
[FINISHED #105077164] Implement cookies choice in portal templates
tomatell Oct 16, 2015
9753aa1
[FIXED #106005736] iOS - Login username is displayed in the header
tomatell Oct 19, 2015
cc3def8
[FIXED #106108862] Disable tap zoom of viewport for iOS
tomatell Oct 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ Search form now recognizes definition fo relative width of column in search resu
```

Supported values are: narrow, normal, wide.

### Cookie Choice
Cookie choice is implemented to comply EU's PERC (The Privacy and Electronic Communications Regulations) .
6 changes: 4 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
"angular-ui-ace": "*",
"angular-translate": "*",
"angular-translate-handler-log": "*",
"angular-translate-storage-cookie": "*",
"angular-translate-storage-cookie": "*",
"components-font-awesome": "~4.3.0",
"angular-sanitize": "1.3.16",
"jquery": "~2.1.3",
"angular-re-captcha": "~0.2.0"
"angular-re-captcha": "~0.2.0",
"angular-qr": "latest",
"cookieconsent2": "~1.0.7"
}
}
3 changes: 2 additions & 1 deletion grunt/configs/copy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module.exports = {

css: {
files: [
{expand: true, cwd: 'src/client/css', src: ['**'], dest: 'build/client/css/'}
{expand: true, cwd: 'src/client/css', src: ['**'], dest: 'build/client/css/'},
{expand: true, cwd: 'src/client/styles', src: ['**'], dest: 'build/client/lib/cookieconsent2/build/'}
]
},
js: {
Expand Down
2 changes: 1 addition & 1 deletion src/client/css/portal-editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
}
}

.icon-remove {
.fa-remove {
color:black;
:hover {
color: white;
Expand Down
17 changes: 12 additions & 5 deletions src/client/html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<meta name="author" content="" />
<meta name="description" content="" />
<meta name="copyright" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0,user-scalable=no">

<link rel="stylesheet" href="css/x.css" />
<link rel="stylesheet" href="css/x-default.css" />
Expand Down Expand Up @@ -48,6 +48,9 @@
<script src="js/safeUrlEncoder.js"></script>
<script src="js/QueryFilter.js"></script>

<!-- QR Code generator -->
<script type="text/javascript" src="lib/angular-qr/lib/qrcode.js"></script>
<script type="text/javascript" src="lib/angular-qr/angular-qr.min.js"></script>

</head>
<body ng-app="x-registries" ng-class="{'login-page': !security.currentUser.systemCredentials.login.loginName}">
Expand All @@ -61,14 +64,16 @@

<nav>
<ul>
<li ng-show="hasPermissions(['System User'])"><span class="text-block"
<li ng-show="isMobile"><a href="membery://index"><i class="fa fa-arrow-left"></i></a></li>
<li ng-show="isIos"><a href="javascript:history.go(-1);"><i class="fa fa-arrow-left"></i></a></li>
<li ng-show="hasPermissions(['System User']) && !isMobile && !isIos"><span class="text-block"
>{{security.currentUser.baseData.name}}&nbsp;{{security.currentUser.baseData.surName}}</span></li>
<li ng-show="hasPermissions(['System User'])"><div class="x-login-photo" ng-style="{'background-image': 'url(' + security.currentUser.photoInfo.photo + ')'}"></div>
</li>
<li ng-show="!hasPermissions(['System User'])"><a href="#/help" target="_blank"><i class="icon-question-circle"></i></a></li>
<li ng-show="hasPermissions(['System User'])"><a href="#/help"><i class="icon-question-circle"></i></a></li>
<li ng-show="!hasPermissions(['System User'])"><a href="#/help" target="_blank"><i class="fa fa-question-circle"></i></a></li>
<li ng-show="hasPermissions(['System User'])"><a href="#/help"><i class="fa fa-question-circle"></i></a></li>
<li ng-show="hasPermissions(['System User'])" class="" ng-controller="xpsui:SecurityLogoutCtrl"><a
href="#" ng-click="logout();"><i class="icon-power-off"></i></a
href="#" ng-click="logout();"><i class="fa fa-power-off"></i></a
></li>
</ul>
</nav>
Expand All @@ -90,5 +95,7 @@
<div class="x-main-content">
<ng-view></ng-view>
</div>

</div>
</body>
</html>
299 changes: 230 additions & 69 deletions src/client/img/logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 17 additions & 2 deletions src/client/js/x-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
'xpsui:controllers',
'pascalprecht.translate',
'ui.ace',
'reCAPTCHA'
'reCAPTCHA',
'ja.qr',

// 'x-security',
// 'personal-page',
Expand Down Expand Up @@ -129,7 +130,21 @@
* Main function, initializes all required data and scopes. For configuration of $providers
* use .config
*/
.run(["$rootScope", '$location', 'xpsui:SecurityService', '$cookies','xpsui:NotificationFactory', function($rootScope, $location, SecurityService,$cookies,notificationFactory) {
.run(["$rootScope", '$location', 'xpsui:SecurityService', '$cookies','xpsui:NotificationFactory', '$window', function($rootScope, $location, SecurityService,$cookies,notificationFactory, $window) {
if($window.navigator && $window.navigator.userAgent) {
if($window.navigator.userAgent.indexOf("Crosswalk") > -1 ) {
$rootScope.isMobile = true;
} else {
$rootScope.isMobile = false;
}
if( $window.navigator.userAgent.indexOf("iPhone") > -1 | $window.navigator.userAgent.indexOf("iPad") > -1 ) {
$rootScope.isIos = true;
} else {
$rootScope.isIos = false;
}
} else {
$rootScope.isMobile = false;
}
$rootScope.security = $rootScope.security || {};
// by default, current user is undefined, as there is noone logged in
$rootScope.hasPermissions=SecurityService.hasPermissions;
Expand Down
2 changes: 1 addition & 1 deletion src/client/js/x-translation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@
});

$translateProvider.translations('ja', {
"login.title": "ログイン画面",
"login.title": "ログイン",
"login.loginName": "ログイン名",
"login.password": "パスワード",
"login.forgottenPassword": "パスワードを忘れた場合",
Expand Down
19 changes: 15 additions & 4 deletions src/client/js/xpsui/controller/help-page-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@

angular.module('xpsui:controllers')
.controller('xpsui:HelpPageCtrl', [
"$scope",
function($scope) {
$scope.greeting = 'Help';
console.log($scope.greeting);
"$scope",
"$location",
'$cookies',
function($scope, $location, $cookies) {
if ($cookies.loginName) {
$scope.loggedin=true;
} else {
$scope.loggedin = false;
}

var url = $location.absUrl().replace('#/help', '');
var token = $cookies.securityToken;
$scope.genQrcode = function(bannerDat) {
$scope.qrcode = '{"loginName": "' + $cookies.loginName + '", "bannerDat":"' + bannerDat + '", "url":"' + url + '"}';
}
}
]);
}(window.angular));
2 changes: 1 addition & 1 deletion src/client/js/xpsui/controller/security-login-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
SecurityService.getCurrentUser().success(function(data){
$rootScope.security.currentUser=data;
if (!navigationService.back()) {
$location.path(config.get('after_login_url') || '/dashboard');
$location.path(config.get( 'after_login_url') || '/dashboard' );
}
});
});
Expand Down
2 changes: 1 addition & 1 deletion src/client/js/xpsui/directives/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

var btn = angular.element('<button type="button" class="btn"></button>');

var icon = angular.element('<i class="icon-search"></i>');
var icon = angular.element('<i class="fa fa-search"></i>');
var iconSpinner = angular.element('<i class="fa fa-spinner fa-spin"></i>');

btn.append(icon);
Expand Down
4 changes: 2 additions & 2 deletions src/client/js/xpsui/directives/array-control-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
+ ' xpsui-by-schema-field-edit xpsui-schema="xpsuiSchema.items[key]"'
+ ' xpsui-model="$parent.item[key]">x</div>'
+ ' <button ng-click="removeByIndex($index);" class="btn-clear">'
+ ' <i class="icon-minus"></i> {{\'generic.search.remove\' | translate}}'
+ ' <i class="fa fa-minus"></i> {{\'generic.search.remove\' | translate}}'
+ ' </button>'
+ '</div>'
+ '<div class="xpsui-array-control-noItems" ng-show="!ngModel || ngModel.length==0">{{"generic.noItems.label" | translate}}</div>'
+ '<div class="pull-right">'
+ ' <button ng-click="appendNew();" class="btn-clear"><i class="icon-add"></i> {{"generic.search.add" | translate}}</button>'
+ ' <button ng-click="appendNew();" class="btn-clear"><i class="fa fa-plus"></i> {{"generic.search.add" | translate}}</button>'
+ '</div>'
+ ' </fieldset>';

Expand Down
4 changes: 2 additions & 2 deletions src/client/js/xpsui/directives/imageresizor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@
var buttonsHolder = angular.element('<div class="xpsui-buttons-holder"></div>');
modalContentEl.append(buttonsHolder);

var buttonRotate = $compile(angular.element('<button type="button" class="btn-secondary xpsui-icon-rotate"><icon class="icon-rotate"></icon> <span>{{\'psui.imageresizor.rotate\' | translate}}</span></button>'))(scope);
var buttonRotate = $compile(angular.element('<button type="button" class="btn-secondary xpsui-icon-rotate"><icon class="fa fa-repeat"></icon> <span>{{\'psui.imageresizor.rotate\' | translate}}</span></button>'))(scope);
buttonsHolder.append(buttonRotate);

var buttonOk = $compile(angular.element('<button type="button" class="btn-secondary xpsui-icon-ok"><icon class="icon-check"></icon> <span>{{\'psui.imageresizor.ok\' | translate}}</span></button>'))(scope);
var buttonOk = $compile(angular.element('<button type="button" class="btn-secondary xpsui-icon-ok"><icon class="fa fa-check"></icon> <span>{{\'psui.imageresizor.ok\' | translate}}</span></button>'))(scope);
buttonsHolder.append(buttonOk);

var buttonClose = angular.element('<div class="x-modalview-close"></div>');
Expand Down
2 changes: 1 addition & 1 deletion src/client/js/xpsui/directives/multistring-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
container.empty();
for (i in ngModel.$modelValue) {
stringElm = angular.element('<div class="portal-multistring-element"><span>'+ngModel.$modelValue[i]+'</span></div>');
xButton = angular.element('<i class="icon-remove"></i>');
xButton = angular.element('<i class="fa fa-remove"></i>');
xButton.data('idx', i);

xButton.on('click', function(evt) {
Expand Down
28 changes: 14 additions & 14 deletions src/client/js/xpsui/directives/portal-menu-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
elm.addClass('portal-menu-editor');

var header = angular.element('<div class="portal-menu-header"></div>');
var openIcon = angular.element('<i class="icon-minus" style="padding-right:10px;"></i>');
var openIcon = angular.element('<i class="fa fa-minus" style="padding-right:10px;"></i>');
var children = angular.element('<div style="padding-left: 20px;"><div ng-repeat="c in index.subElements"><div xpsui-portal-menu-editor="c" portal-menu-index="$index"></div></div></div>');
var actionButtons = angular.element('<span style="padding-left: 10px;" class="x-hidden"></span>');
var editButton = angular.element('<i class="action-button icon-pencil"></i>');
var addButton = angular.element('<i class="action-button icon-add"></i>');
var removeButton = angular.element('<i class="action-button icon-minus" ng-click="removeParent()"></i>');
var downButton = angular.element('<i class="action-button icon-chevron-down" ng-click="downFn()"></i>');
var upButton = angular.element('<i class="action-button icon-chevron-up" ng-click="upFn()"></i>');
var editButton = angular.element('<i class="action-button fa fa-pencil"></i>');
var addButton = angular.element('<i class="action-button fa fa-plus"></i>');
var removeButton = angular.element('<i class="action-button fa fa-minus" ng-click="removeParent()"></i>');
var downButton = angular.element('<i class="action-button fa fa-chevron-down" ng-click="downFn()"></i>');
var upButton = angular.element('<i class="action-button fa fa-chevron-up" ng-click="upFn()"></i>');

var editPanel = angular.element('<table class="x-hidden portal-menu-editor-edit-panel">' +
'<tr><td>Meno:</td><td><input ng-model="index.name"</td></tr>' +
Expand Down Expand Up @@ -116,8 +116,8 @@

header.on('click', function(evt) {
if (scope.index && scope.index.subElements && scope.index.subElements.length > 0) {
openIcon.toggleClass('icon-add');
openIcon.toggleClass('icon-minus');
openIcon.toggleClass('fa fa-plus');
openIcon.toggleClass('fa fa-minus');

children.toggleClass('x-hidden');
}
Expand All @@ -138,9 +138,9 @@
header.append(actionButtons);

if (scope.index.name != 'ROOT' && scope.index && scope.index.subElements && scope.index.subElements.length < 1) {
openIcon.removeClass('icon-minus');
openIcon.removeClass('icon-add');
openIcon.addClass('icon-circle-o');
openIcon.removeClass('fa fa-minus');
openIcon.removeClass('fa fa-plus');
openIcon.addClass('fa fa-circle-o');
console.log('name: ' + scope.index.subElements);
}

Expand All @@ -158,9 +158,9 @@
tags: [],
subElements: []
});
openIcon.addClass('glyphicon-minus-sign');
openIcon.removeClass('glyphicon-record');
openIcon.removeClass('glyphicon-plus-sign');
openIcon.addClass('fa fa-minus');
openIcon.removeClass('fa fa-circle-o');
openIcon.removeClass('fa fa-plus');
children.removeClass('x-hidden');
};

Expand Down
2 changes: 1 addition & 1 deletion src/client/js/xpsui/directives/portal-multistring-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
container.empty();
for (i in ngModel.$modelValue) {
stringElm = angular.element('<div class="portal-multistring-element"><span>'+ngModel.$modelValue[i]+'</span></div>');
xButton = angular.element('<i class="glyphicon-remove"></i>');
xButton = angular.element('<i class="fa fa-minus"></i>');
xButton.data('idx', i);

xButton.on('click', function(evt) {
Expand Down
2 changes: 1 addition & 1 deletion src/client/js/xpsui/directives/portal-widget-category-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
elm.empty();
elm.addClass('x-portal-widget-edit');

var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button icon-chevron-up" ng-click="moveUp();"></i><i class="action-button icon-chevron-down" ng-click="moveDown();"></i><i class="action-button icon-trash" ng-click="remove();"></i></div></div>');
var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button fa fa-chevron-up" ng-click="moveUp();"></i><i class="action-button fa fa-chevron-down" ng-click="moveDown();"></i><i class="action-button fa fa-trash" ng-click="remove();"></i></div></div>');
var content = angular.element(
'<form class="form">'
+'<fieldset class="form-group" style="background-color: black; padding: 10px;" ng-show="mode !== \'edit\'">'
Expand Down
8 changes: 4 additions & 4 deletions src/client/js/xpsui/directives/portal-widget-file-list-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
elm.empty();
elm.addClass('x-portal-widget-edit');

var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button icon-add" ng-click="add();"></i><i class="action-button icon-chevron-up" ng-click="moveUp();"></i><i class="action-button icon-chevron-down" ng-click="moveDown();"></i><i class="action-button icon-trash" ng-click="remove();"></i></div></div>');
var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button fa fa-plus" ng-click="add();"></i><i class="action-button fa fa-chevron-up" ng-click="moveUp();"></i><i class="action-button fa fa-chevron-down" ng-click="moveDown();"></i><i class="action-button fa fa-trash" ng-click="remove();"></i></div></div>');

var content = angular.element('<div style="padding-left: 1px;">' +
'<div ng-repeat="file in data.data.files" class="psui-wrapper" style="padding: 10px; position: relative;">' +
'<div style="position: absolute; right: 5px; top: 10px;">' +
'<i class="action-button icon-chevron-left" ng-click="photoLeft($index);"></i>'+
'<i class="action-button icon-trash" ng-click="photoRemove($index);"></i>'+
'<i class="action-button icon-chevron-right" ng-click="photoRight($index);"></i>'+
'<i class="action-button fa fa-chevron-left" ng-click="photoLeft($index);"></i>'+
'<i class="action-button fa fa-trash" ng-click="photoRemove($index);"></i>'+
'<i class="action-button fa fa-chevron-right" ng-click="photoRight($index);"></i>'+
'</div>' +
'<div><div xpsui-uploadable-file ng-model="data.data.files[$index]"></div></div>' +
'</div>' +
Expand Down
8 changes: 4 additions & 4 deletions src/client/js/xpsui/directives/portal-widget-gallery-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
elm.empty();
elm.addClass('x-portal-widget-edit');

var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button icon-add" ng-click="add();"></i><i class="action-button icon-chevron-up" ng-click="moveUp();"></i><i class="action-button icon-chevron-down" ng-click="moveDown();"></i><i class="action-button icon-trash" ng-click="remove();"></i></div></div>');
var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button fa fa-plus" ng-click="add();"></i><i class="action-button fa fa-chevron-up" ng-click="moveUp();"></i><i class="action-button fa fa-chevron-down" ng-click="moveDown();"></i><i class="action-button fa fa-trash" ng-click="remove();"></i></div></div>');
// var content = angular.element('<div class="psui-wrapper" style="text-align: center;"><psui-uploadable-image psui-imageresizor="" psui-imageresizor-width="656" psui-imageresizor-height="492" ng-model="data.data.img" style="width: 656px !important; height: 492px !important; background-image: url(https://localhost:3443/img/no_image.jpg); margin:0;"></psui-uploadable-image></div>');

var content = angular.element('<div style="padding-left: 1px;">' +
'<div ng-repeat="photo in data.data.images" class="psui-wrapper" style="display: inline-block; padding: 0px; position: relative;">' +
'<div style="width: 162px; position: absolute; left: 45px; top: 5px; z-index: 100;">' +
'<i class="action-button icon-chevron-left" ng-click="photoLeft($index);"></i>'+
'<i class="action-button icon-trash" ng-click="photoRemove($index);"></i>'+
'<i class="action-button icon-chevron-right" ng-click="photoRight($index);"></i>'+
'<i class="action-button fa fa-chevron-left" ng-click="photoLeft($index);"></i>'+
'<i class="action-button fa fa-trash" ng-click="photoRemove($index);"></i>'+
'<i class="action-button fa fa-chevron-right" ng-click="photoRight($index);"></i>'+
'</div>' +
'<div xpsui-uploadable-image xpsui-imageresizor psui-width="656" psui-height="492" ng-model="photo.img" style="width: 162px !important; height: 123px !important; background-image: url(/img/no_image.jpg); margin:0;">' +
'</div>' +
Expand Down
6 changes: 3 additions & 3 deletions src/client/js/xpsui/directives/portal-widget-gallery-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
'<div ng-repeat="photo in data.data.images" ng-show="visibleIndex == $index" style="display: inline-block; padding-left: 1px; position: absolute; top: 10px; bottom: 10px; left: 10px; right: 10px;">' +
'<img ng-src="{{photo.img}}" style="width: 656px !important; height: 492px !important; margin:0;"></img>' +
'<div style="position: absolute; bottom: 0; left: 0;">' +
'<i class="icon-chevron-left" ng-click="photoLeft();"></i>'+
' <i class="icon-chevron-right" ng-click="photoRight();"></i>'+
'<i class="fa fa-chevron-left" ng-click="photoLeft();"></i>'+
' <i class="fa fa-chevron-right" ng-click="photoRight();"></i>'+
'</div>'+
'<div style="position: absolute; bottom: 0; right: 0; font-size: 18px;">' +
'<i class="icon-remove" ng-click="close();"></i>'+
'<i class="fa fa-remove" ng-click="close();"></i>'+
'</div>'+
'</div>' +
'</div>' +
Expand Down
2 changes: 1 addition & 1 deletion src/client/js/xpsui/directives/portal-widget-image-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
elm.empty();
elm.addClass('x-portal-widget-edit');

var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button icon-chevron-up" ng-click="moveUp();"></i><i class="action-button icon-chevron-down" ng-click="moveDown();"></i><i class="action-button icon-trash" ng-click="remove();"></i></div></div>');
var titleBar = angular.element('<div class="xpsui-portal-widget-title-bar">{{data.meta.type}}:{{data.meta.name}}<div class="pull-right"><i class="action-button fa fa-chevron-up" ng-click="moveUp();"></i><i class="action-button icon-chevron-down" ng-click="moveDown();"></i><i class="action-button fa fa-trash" ng-click="remove();"></i></div></div>');
var content = angular.element('<div class="psui-wrapper" style="text-align: center;"><div xpsui-uploadable-image="" xpsui-imageresizor="" psui-width={{data.config.width}} psui-height={{data.config.height}} ng-model="data.data.img" style="width: 100% !important; height: 492px !important; background-image: url(https://localhost:3443/img/no_image.jpg); margin:0;" class="xpsui-uploadable-image xpsui-imageresizor"></div></div>');

elm.append(titleBar);
Expand Down
Loading