Skip to content

Commit

Permalink
Item12180: update cart icon; show confirm dialog before disarding cha…
Browse files Browse the repository at this point in the history
…nges

git-svn-id: http://svn.foswiki.org/trunk@15971 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 10, 2012
1 parent d144806 commit 3367eb7
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 10 deletions.
Binary file modified core/lib/Foswiki/Configure/resources/autocheck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/lib/Foswiki/Configure/resources/autocheck.psd
Binary file not shown.
Binary file removed core/lib/Foswiki/Configure/resources/cart.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified core/lib/Foswiki/Configure/resources/icon_error.psd
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions core/lib/Foswiki/Configure/resources/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,14 @@ $(document).ready(function () {
$(".extensionsHelp").click(function() {
$(".configureExtensionsHelp").toggleClass("foswikiHidden");
});

$(".configureActions .discardChanges").click(function(e) {
console.log("discardChanges", this, e);
if (window.confirm("Are you really sure you want to discard your changes?")) {
return setSubmitAction(this, 'DiscardChanges');
}
return false;
});

configure.toggleExpertsMode('expert');
configure.toggleInfoMode();
Expand Down
20 changes: 10 additions & 10 deletions core/lib/Foswiki/Configure/resources/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ body.configureShowOneSection .configureNotShowSection {
.configureStatusOK,
.configureStatusWarnings,
.configureStatusErrors {
padding:7px .5em 7px 22px;
padding:7px 1em 7px 22px;
background-position:0 45%;
background-repeat:no-repeat;
}
Expand Down Expand Up @@ -205,16 +205,14 @@ table.configureFeedbackSummaryTable td {
color:black;
}
.configureFeedbackSummaryCell .configureOk,
.configureFeedbackSummaryCell .configureUnsaved {
.configureFeedbackSummaryCell .configureUnsaved,
.configureFeedbackSummaryCell .configureNoChanges {
display: inline-block;
padding-top: 0;
padding-bottom: 0;
padding-left: 2em;
padding-left: 22px;
background-position:0 0;
}
.configureFeedbackSummaryCell .configureUnsaved {
padding-left: 32px;
}
.configureFeedback {
max-height: 200px;
overflow: auto;
Expand Down Expand Up @@ -543,9 +541,6 @@ table.configureSectionValues .foswikiTextarea {
}

/* WARN and ERROR */
.configureWarn,.configureUnsaved {
color:#f60;
}
.configureRootSection div.foswikiAlert {
background-color:#fff;
color:#000;
Expand All @@ -561,6 +556,7 @@ div.configureInfoText {
color:green;
}
div.configureUnsaved,
div.configureNoChanges,
div.configureError,
div.configureWarn,
div.configureOk {
Expand All @@ -575,8 +571,12 @@ div.configureWarn {
background-image:url(%RESOURCEURI%icon_warn.png);
}
div.configureUnsaved {
background-image:url(%RESOURCEURI%cart.png);
background-image:url(%RESOURCEURI%icon_changes.png);
}
div.configureNoChanges {
background-image:url(%RESOURCEURI%icon_nochanges.png);
}

div.configureOk {
background-image:url(%RESOURCEURI%icon_ok.png);
}
Expand Down

0 comments on commit 3367eb7

Please sign in to comment.