Skip to content

Commit

Permalink
Merge pull request #136 from rupok/development
Browse files Browse the repository at this point in the history
update latest dev
  • Loading branch information
rupok authored Jan 14, 2019
2 parents ca08b45 + b7cc1d7 commit 87d94b0
Show file tree
Hide file tree
Showing 75 changed files with 17,952 additions and 4,605 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

elements/.DS_Store
.DS_Store
.phpintel
.vscode
assets/js/ewr.php
node_modules
package-lock.json
.sass-cache
30 changes: 24 additions & 6 deletions admin/assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,15 @@
}
.eael-settings-tabs ul li a {
padding: 15px 20px;
background: #ECF0F1;
color: #646464;
font-size: 16px;
background: #f8fafb;
color: #516378;
font-size: 15px;
font-weight: 600;
text-transform: uppercase;
text-decoration: none;
border: 1px solid rgba( 0,0,0,0.1 );
border-bottom: none;
border-top: 2px solid #f8fafb;
}
.eael-settings-tabs ul li:first-child a {
border-left: 1px solid rgba( 0,0,0,0.1 )
}
.eael-settings-tabs ul li a:focus {
outline: none;
Expand Down Expand Up @@ -229,6 +230,7 @@ textarea.eael-form-control {
}
.eael-tabs li a.active {
background-color: #fff;
border-top: 2px solid #6648FE;
}
/* Footer Style */

Expand Down Expand Up @@ -585,3 +587,19 @@ textarea.eael-form-control {
.eael-fb-own-app-settings.eael-active, #eaelFBbtn.eael-active, #eaelFBbtnOwnApp.eael-active {
display: block;
}

.warning {
margin: 10px 0;
padding: 10px;
border-radius: 3px 3px 3px 3px;
color: #D8000C;
background-color: #FFBABA;
overflow: hidden;
}

.warning > * {
float: left;
}
#eael_plugins_versions {
height: 36px;
}
123 changes: 62 additions & 61 deletions admin/assets/css/eael-notice.css
Original file line number Diff line number Diff line change
@@ -1,64 +1,65 @@

/* review notice */

.eael-review-notice{
padding: 15px 15px 15px 0;
background-color: #fff;
border-radius: 3px;
margin: 20px 20px 0 0;
border-left: 4px solid transparent;
}
.eael-review-notice:after{
content: '';
display: table;
clear: both;
}
.eael-review-thumbnail{
width: 114px;
float: left;
line-height: 80px;
text-align: center;
border-right: 4px solid transparent;
}
.eael-review-thumbnail img {
width: 72px;
vertical-align: middle;
opacity: .85;
transition: all .3s;
}
.eael-review-thumbnail img:hover {
opacity: 1;
}
.eael-review-text{
overflow: hidden;
}
.eael-review-text h3{
font-size: 24px;
margin: 0 0 5px;
font-weight: 400;
line-height: 1.3;
}
.eael-review-text p{
font-size: 13px;
margin: 0 0 5px;
}
.eael-review-ul{
margin: 0;
padding: 0;
}
.eael-review-ul li{
display: inline-block;
margin-right: 15px;
}
.eael-review-ul li a{
display: inline-block;
color: #10738B;
text-decoration: none;
padding-left: 26px;
position: relative;
}
.eael-review-ul li a span{
position: absolute;
left: 0;
top: -2px;
}
.eael-review-notice {
padding: 10px;
background-color: #fff;
border-radius: 3px;
margin: 15px;
border-left: 4px solid transparent;
display: flex;
align-items: center;
}
.eael-review-notice:after{
content: '';
display: table;
clear: both;
}
.eael-review-thumbnail{
width: 90px;
float: left;
padding: 5px;
text-align: center;
border-right: 4px solid transparent;
}
.eael-review-thumbnail img {
width: 72px;
opacity: .85;
transition: all .3s;
}
.eael-review-thumbnail img:hover {
opacity: 1;
}
.eael-review-text{
overflow: hidden;
}
.eael-review-text h3{
font-size: 24px;
margin: 0 0 5px;
font-weight: 400;
line-height: 1.3;
}
.eael-review-text p{
font-size: 13px;
margin: 0 0 5px;
}
.eael-review-ul {
margin: 8px 0 0 0;
padding: 0;
}
.eael-review-ul li{
display: inline-block;
margin-right: 15px;
}
.eael-review-ul li a{
display: inline-block;
color: #10738B;
text-decoration: none;
padding-left: 26px;
position: relative;
}
.eael-review-ul li a span{
position: absolute;
left: 0;
top: -2px;
}
17 changes: 17 additions & 0 deletions admin/assets/images/icon-christmas-gift.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified admin/assets/images/icon-modules.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified admin/assets/images/icon-settings.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified admin/assets/images/icon-upgrade.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions admin/assets/images/icon-version-control.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions admin/assets/js/rollback-admin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
(function($) {
$(document).ready(function() {
$('#eael_plugins_versions').on('change', function() {
var $this = $(this),
button = $this.siblings('.eael-version-rollback'),
url = button.attr('href'),
val = $this.val(),
url = url+'&upgrade_version='+val;
button.attr('href', url);
});

$('.eael-version-rollback').on( 'click', function(e) {
e.preventDefault();
var $this = $( this ),
dialogsManager = new DialogsManager.Instance();

dialogsManager.createWidget( 'confirm', {
headerMessage: EAELRollBackConfirm.i18n.rollback_to_previous_version,
message : EAELRollBackConfirm.i18n.rollback_confirm,
strings : {
cancel : EAELRollBackConfirm.i18n.cancel,
confirm: EAELRollBackConfirm.i18n.yes,
},
onConfirm: function() {
$this.addClass( 'loading' );
location.href = $this.attr( 'href' );
}
} ).show();
} );
});

})(jQuery);
Loading

0 comments on commit 87d94b0

Please sign in to comment.