Skip to content

Commit

Permalink
Dev: Updated adminpanel to be working in most other colors as well
Browse files Browse the repository at this point in the history
Also fixed the saving bug
  • Loading branch information
lacrioque committed Jul 26, 2017
1 parent e64723d commit 38d3019
Show file tree
Hide file tree
Showing 36 changed files with 292 additions and 97 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -29,6 +29,9 @@
!/plugins/Demo/
!/plugins/AuditLog/

#ignore old styles
/styles/

#ignore most of the js-build stuff
.eslintrc
.eslintignore
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions assets/styles-admin/Apple_Blossom/css/lime-admin-common.css
Expand Up @@ -234,7 +234,8 @@ html {
.surveymanagerbar {
margin-top: -20px;
padding-top: 5px; }
.surveymanagerbar h3 {

.surveymanagerbar .h3 {
margin-top: 5px;
font-weight: 300;
font-size: 1.5em; }
Expand Down Expand Up @@ -748,7 +749,6 @@ div.panel.disabled {

.side-body {
min-height: 800px;
margin-left: 320px;
}

.side-body-margin {
Expand Down Expand Up @@ -1492,6 +1492,16 @@ h3 .glyphicon-chevron-up, h3 .glyphicon-chevron-down, h3 .glyphicon-chevron-righ
#systemoverview {
margin: 1em 0 1em 0; }

#systemoverview .info div {
font-size: 14px;
margin-top: 10px;
margin-bottom: 10px;
font-weight: 500;
line-height: 1.1;
color: inherit;
text-align: center;
}

/**
* Ajax loader
* from : http://codepen.io/weaintplastic/pen/qEMZbx
Expand Down Expand Up @@ -2221,6 +2231,10 @@ table#responsedetail tr td{
justify-content: center;
}

.welcome .panel-title {
font-weight: 500;
}

.welcome .panel-body {
height: 75%;
width: 100%;
Expand Down
18 changes: 10 additions & 8 deletions assets/styles-admin/Apple_Blossom/scripts/save.js
@@ -1,12 +1,12 @@
var formSubmitting = false;
$(document).ready(function(){
$(document).on('ready pjax:complete', function(){

/** These buttons are in global settings */
if ($('#save-form-button').length>0){
$("#save-form-button").on('click', function(ev){
ev.preventDefault();
var formid = '#'+$(this).attr('data-form-id');
$form = $(formid);
var $form = $(formid);
//alert($form.find('[type="submit"]').attr('id'));
$form.find('[type="submit"]').trigger('click');
return false;
Expand Down Expand Up @@ -43,26 +43,28 @@ var closeAfterSaveInput = $("<input>")
* @return {object} jQuery DOM form object
*/
var getForm = function (that) {
var $form;
var form;
if($(that).attr('data-use-form-id')==1)
{
formId = '#'+$(that).attr('data-form-to-save');
$form = $(formId);
form = [$(formId)];
}
else
{
$form = $('.side-body').find('form');
form = $('#pjax-content').find('form');
}
return $form;

if(form.length < 1)
throw "No form Found this can't be!";

return form;
};

if ($('#save-button').length > 0){
$('#save-button').on('click', function(ev)
{
ev.preventDefault();
var $form = getForm(this);
closeAfterSaveInput.val("false");
$form.append(closeAfterSaveInput);
formSubmitting = true;
$form.find('[type="submit"]').first().trigger('click');
});
Expand Down
7 changes: 7 additions & 0 deletions assets/styles-admin/Bay_of_Many/css/lime-admin-colors.css.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions assets/styles-admin/Bay_of_Many/css/lime-admin-common.css
Expand Up @@ -234,7 +234,8 @@ html {
.surveymanagerbar {
margin-top: -20px;
padding-top: 5px; }
.surveymanagerbar h3 {

.surveymanagerbar .h3 {
margin-top: 5px;
font-weight: 300;
font-size: 1.5em; }
Expand Down Expand Up @@ -748,7 +749,6 @@ div.panel.disabled {

.side-body {
min-height: 800px;
margin-left: 320px;
}

.side-body-margin {
Expand Down Expand Up @@ -1492,6 +1492,16 @@ h3 .glyphicon-chevron-up, h3 .glyphicon-chevron-down, h3 .glyphicon-chevron-righ
#systemoverview {
margin: 1em 0 1em 0; }

#systemoverview .info div {
font-size: 14px;
margin-top: 10px;
margin-bottom: 10px;
font-weight: 500;
line-height: 1.1;
color: inherit;
text-align: center;
}

/**
* Ajax loader
* from : http://codepen.io/weaintplastic/pen/qEMZbx
Expand Down Expand Up @@ -2221,6 +2231,10 @@ table#responsedetail tr td{
justify-content: center;
}

.welcome .panel-title {
font-weight: 500;
}

.welcome .panel-body {
height: 75%;
width: 100%;
Expand Down
18 changes: 10 additions & 8 deletions assets/styles-admin/Bay_of_Many/scripts/save.js
@@ -1,12 +1,12 @@
var formSubmitting = false;
$(document).ready(function(){
$(document).on('ready pjax:complete', function(){

/** These buttons are in global settings */
if ($('#save-form-button').length>0){
$("#save-form-button").on('click', function(ev){
ev.preventDefault();
var formid = '#'+$(this).attr('data-form-id');
$form = $(formid);
var $form = $(formid);
//alert($form.find('[type="submit"]').attr('id'));
$form.find('[type="submit"]').trigger('click');
return false;
Expand Down Expand Up @@ -43,26 +43,28 @@ var closeAfterSaveInput = $("<input>")
* @return {object} jQuery DOM form object
*/
var getForm = function (that) {
var $form;
var form;
if($(that).attr('data-use-form-id')==1)
{
formId = '#'+$(that).attr('data-form-to-save');
$form = $(formId);
form = [$(formId)];
}
else
{
$form = $('.side-body').find('form');
form = $('#pjax-content').find('form');
}
return $form;

if(form.length < 1)
throw "No form Found this can't be!";

return form;
};

if ($('#save-button').length > 0){
$('#save-button').on('click', function(ev)
{
ev.preventDefault();
var $form = getForm(this);
closeAfterSaveInput.val("false");
$form.append(closeAfterSaveInput);
formSubmitting = true;
$form.find('[type="submit"]').first().trigger('click');
});
Expand Down
7 changes: 7 additions & 0 deletions assets/styles-admin/Black_Pearl/css/lime-admin-colors.css.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions assets/styles-admin/Black_Pearl/css/lime-admin-common.css
Expand Up @@ -234,7 +234,8 @@ html {
.surveymanagerbar {
margin-top: -20px;
padding-top: 5px; }
.surveymanagerbar h3 {

.surveymanagerbar .h3 {
margin-top: 5px;
font-weight: 300;
font-size: 1.5em; }
Expand Down Expand Up @@ -748,7 +749,6 @@ div.panel.disabled {

.side-body {
min-height: 800px;
margin-left: 320px;
}

.side-body-margin {
Expand Down Expand Up @@ -1492,6 +1492,16 @@ h3 .glyphicon-chevron-up, h3 .glyphicon-chevron-down, h3 .glyphicon-chevron-righ
#systemoverview {
margin: 1em 0 1em 0; }

#systemoverview .info div {
font-size: 14px;
margin-top: 10px;
margin-bottom: 10px;
font-weight: 500;
line-height: 1.1;
color: inherit;
text-align: center;
}

/**
* Ajax loader
* from : http://codepen.io/weaintplastic/pen/qEMZbx
Expand Down Expand Up @@ -2221,6 +2231,10 @@ table#responsedetail tr td{
justify-content: center;
}

.welcome .panel-title {
font-weight: 500;
}

.welcome .panel-body {
height: 75%;
width: 100%;
Expand Down
18 changes: 10 additions & 8 deletions assets/styles-admin/Black_Pearl/scripts/save.js
@@ -1,12 +1,12 @@
var formSubmitting = false;
$(document).ready(function(){
$(document).on('ready pjax:complete', function(){

/** These buttons are in global settings */
if ($('#save-form-button').length>0){
$("#save-form-button").on('click', function(ev){
ev.preventDefault();
var formid = '#'+$(this).attr('data-form-id');
$form = $(formid);
var $form = $(formid);
//alert($form.find('[type="submit"]').attr('id'));
$form.find('[type="submit"]').trigger('click');
return false;
Expand Down Expand Up @@ -43,26 +43,28 @@ var closeAfterSaveInput = $("<input>")
* @return {object} jQuery DOM form object
*/
var getForm = function (that) {
var $form;
var form;
if($(that).attr('data-use-form-id')==1)
{
formId = '#'+$(that).attr('data-form-to-save');
$form = $(formId);
form = [$(formId)];
}
else
{
$form = $('.side-body').find('form');
form = $('#pjax-content').find('form');
}
return $form;

if(form.length < 1)
throw "No form Found this can't be!";

return form;
};

if ($('#save-button').length > 0){
$('#save-button').on('click', function(ev)
{
ev.preventDefault();
var $form = getForm(this);
closeAfterSaveInput.val("false");
$form.append(closeAfterSaveInput);
formSubmitting = true;
$form.find('[type="submit"]').first().trigger('click');
});
Expand Down
7 changes: 7 additions & 0 deletions assets/styles-admin/Dark_Sky/css/lime-admin-colors.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/styles-admin/Dark_Sky/css/lime-admin-common-rtl.css

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions assets/styles-admin/Dark_Sky/css/lime-admin-common.css
Expand Up @@ -234,7 +234,8 @@ html {
.surveymanagerbar {
margin-top: -20px;
padding-top: 5px; }
.surveymanagerbar h3 {

.surveymanagerbar .h3 {
margin-top: 5px;
font-weight: 300;
font-size: 1.5em; }
Expand Down Expand Up @@ -748,7 +749,6 @@ div.panel.disabled {

.side-body {
min-height: 800px;
margin-left: 320px;
}

.side-body-margin {
Expand Down Expand Up @@ -1492,6 +1492,16 @@ h3 .glyphicon-chevron-up, h3 .glyphicon-chevron-down, h3 .glyphicon-chevron-righ
#systemoverview {
margin: 1em 0 1em 0; }

#systemoverview .info div {
font-size: 14px;
margin-top: 10px;
margin-bottom: 10px;
font-weight: 500;
line-height: 1.1;
color: inherit;
text-align: center;
}

/**
* Ajax loader
* from : http://codepen.io/weaintplastic/pen/qEMZbx
Expand Down Expand Up @@ -2221,6 +2231,10 @@ table#responsedetail tr td{
justify-content: center;
}

.welcome .panel-title {
font-weight: 500;
}

.welcome .panel-body {
height: 75%;
width: 100%;
Expand Down
18 changes: 10 additions & 8 deletions assets/styles-admin/Dark_Sky/scripts/save.js
@@ -1,12 +1,12 @@
var formSubmitting = false;
$(document).ready(function(){
$(document).on('ready pjax:complete', function(){

/** These buttons are in global settings */
if ($('#save-form-button').length>0){
$("#save-form-button").on('click', function(ev){
ev.preventDefault();
var formid = '#'+$(this).attr('data-form-id');
$form = $(formid);
var $form = $(formid);
//alert($form.find('[type="submit"]').attr('id'));
$form.find('[type="submit"]').trigger('click');
return false;
Expand Down Expand Up @@ -43,26 +43,28 @@ var closeAfterSaveInput = $("<input>")
* @return {object} jQuery DOM form object
*/
var getForm = function (that) {
var $form;
var form;
if($(that).attr('data-use-form-id')==1)
{
formId = '#'+$(that).attr('data-form-to-save');
$form = $(formId);
form = [$(formId)];
}
else
{
$form = $('.side-body').find('form');
form = $('#pjax-content').find('form');
}
return $form;

if(form.length < 1)
throw "No form Found this can't be!";

return form;
};

if ($('#save-button').length > 0){
$('#save-button').on('click', function(ev)
{
ev.preventDefault();
var $form = getForm(this);
closeAfterSaveInput.val("false");
$form.append(closeAfterSaveInput);
formSubmitting = true;
$form.find('[type="submit"]').first().trigger('click');
});
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 38d3019

Please sign in to comment.