Skip to content

Commit

Permalink
Item12180: move unsaved message to bottom; update gifs to pngs
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@15885 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 4, 2012
1 parent 2f2b18f commit 0b425de
Show file tree
Hide file tree
Showing 22 changed files with 42 additions and 36 deletions.
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Configure/UIs/Value.pm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ HERE
my $tip = $root->{controls}->addTooltip($info);
my $scriptName = Foswiki::Configure::CGI::getScriptName();
my $image =
"<img src='${Foswiki::resourceURI}icon_info.gif' alt='Show info' title='Show info' />";
"<img src='${Foswiki::resourceURI}icon_info.png' alt='Show info' title='Show info' />";
$helpTextLink =
"<span class='foswikiMakeVisible'><a href='#' onclick='return toggleInfo($tip);'>$image</a></span>";
$helpText =
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified core/lib/Foswiki/Configure/resources/icon_error.psd
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed core/lib/Foswiki/Configure/resources/icon_info.gif
Binary file not shown.
Binary file modified core/lib/Foswiki/Configure/resources/icon_info.psd
Binary file not shown.
Binary file modified core/lib/Foswiki/Configure/resources/icon_ok.psd
Binary file not shown.
Binary file removed core/lib/Foswiki/Configure/resources/icon_warn_blue.gif
Binary file not shown.
Binary file not shown.
Binary file modified core/lib/Foswiki/Configure/resources/icon_warning.psd
Binary file not shown.
Binary file removed core/lib/Foswiki/Configure/resources/icon_world.gif
Binary file not shown.
22 changes: 11 additions & 11 deletions core/lib/Foswiki/Configure/resources/pattern.css
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ table {

html body {
font-family: Arial, sans-serif;
font-size: 13.5px;
font-size: 13px;
}
body {
line-height: 22px;
Expand Down Expand Up @@ -1263,7 +1263,7 @@ pre ul:last-child,
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.foswikiButton:first-child,
Expand Down Expand Up @@ -1451,7 +1451,7 @@ pre ul:last-child,
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.foswikiSubmit:first-child {
Expand Down Expand Up @@ -1551,7 +1551,7 @@ pre ul:last-child,
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.foswikiButtonCancel:first-child {
Expand Down Expand Up @@ -1652,7 +1652,7 @@ pre ul:last-child,
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.foswikiButtonDisabled:first-child,
Expand Down Expand Up @@ -2045,7 +2045,7 @@ textarea.foswikiTextareaRawView:focus {
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
margin: 0 0 6px 6px;
}
Expand Down Expand Up @@ -2738,7 +2738,7 @@ li.patternLogIn {
background-image:url(popup.gif);
background-repeat:no-repeat;
background-position:right;
padding-right:13.5px;
padding-right:13px;
margin-right:3px;
}

Expand Down Expand Up @@ -3980,8 +3980,8 @@ label.ui-button.ui-state-active,
zoom: 1;
}
.ui-dialog .ui-resizable-se {
width: 13.5px;
height: 13.5px;
width: 13px;
height: 13px;
right: 3px;
bottom: 3px;
}
Expand Down Expand Up @@ -4630,7 +4630,7 @@ a.jqButton {
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.jqButton:first-child,
Expand Down Expand Up @@ -4755,7 +4755,7 @@ a.jqButton.foswikiButtonCancel,
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
a.jqButton.foswikiButtonCancel:first-child,
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Configure/resources/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ function doFeedback(key, pathinfo) {
working = 'Working...';
}
stsWindowId = key.id.replace(/feedreq\d+$/, 'status');
$('#' + configure.utils.quoteName(stsWindowId)).replaceWith("<div id=\"" + stsWindowId + "\" class=\"configureFeedbackPending\"><span class=\"configureFeedbackPendingMessage\">" + working + "</span></div>");
$('#' + configure.utils.quoteName(stsWindowId)).replaceWith("<div id=\"" + stsWindowId + "\" class=\"configureFeedbackPending configureInfo\"><span class=\"configureFeedbackPendingMessage\">" + working + "</span></div>");

/* Make the request
* ** N.B. Definitely broken with jQuery 1.3 (unreliable selectors), 1.8.2 used.
Expand Down
31 changes: 19 additions & 12 deletions core/lib/Foswiki/Configure/resources/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ body.configureShowOneSection .configureNotShowSection {
background-repeat:no-repeat;
}
.configureStatusWarnings {
background-image:url(%RESOURCEURI%icon_warn_white.gif);
background-image:url(%RESOURCEURI%icon_warn.png);
}
.configureStatusErrors {
background-image:url(%RESOURCEURI%icon_error_white.gif);
background-image:url(%RESOURCEURI%icon_error.png);
}

table.configureFeedbackSummaryTable {
Expand All @@ -142,12 +142,19 @@ table.configureFeedbackSummaryTable td {
border-style:none;
}
.configureFeedbackSummaryCell {
background-color:#fffbe8;
}
.configureFeedbackSummaryCell .configureFeedbackUnsaved {
font-size:xx-small;
color:black;
}
.configureFeedbackSummaryCell .configureOk,
.configureFeedbackSummaryCell .configureWarn {
display: inline-block;
padding-top: 0;
padding-bottom: 0;
padding-left: 2em;
background-position:0 0;
}

.configureFeedback {
max-height: 200px;
Expand Down Expand Up @@ -205,7 +212,7 @@ div.configureFeedbackError H1 {
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.configureFeedbackButton1:first-child {
Expand Down Expand Up @@ -305,7 +312,7 @@ div.configureFeedbackError H1 {
font-family: sans-serif;
font-weight: normal;
font-style: normal;
font-size: 13.5px;
font-size: 13px;
text-decoration: none;
}
.configureFeedbackButton2:first-child {
Expand Down Expand Up @@ -496,12 +503,12 @@ ul li a.configureWarnAndError:hover {
ul li a.configureError:link,
ul li a.configureError:visited,
ul li a.configureError:hover {
background-image:url(%RESOURCEURI%icon_error_white.gif);
background-image:url(%RESOURCEURI%icon_error.png);
}
ul li a.configureWarn:link,
ul li a.configureWarn:visited,
ul li a.configureWarn:hover {
background-image:url(%RESOURCEURI%icon_warn_white.gif);
background-image:url(%RESOURCEURI%icon_warn.png);
}
ul li.configureMenuSelected a.configureWarnAndError:link,
ul li.configureMenuSelected a.configureWarnAndError:visited,
Expand All @@ -518,11 +525,11 @@ ul li.configureMenuSelected a.configureWarnAndError:visited {
}
ul li.configureMenuSelected a.configureError:link,
ul li.configureMenuSelected a.configureError:visited {
background-image:url(%RESOURCEURI%icon_error_blue.gif);
background-image:url(%RESOURCEURI%icon_error.png);
}
ul li.configureMenuSelected a.configureWarn:link,
ul li.configureMenuSelected a.configureWarn:visited {
background-image:url(%RESOURCEURI%icon_warn_blue.gif);
background-image:url(%RESOURCEURI%icon_warn.png);
}
/* --- TABLE ROWS & COLUMNS --- */
/*
Expand Down Expand Up @@ -603,13 +610,13 @@ div.configureOk {
background-repeat:no-repeat;
}
div.configureError {
background-image:url(%RESOURCEURI%icon_error_white.gif);
background-image:url(%RESOURCEURI%icon_error.png);
}
div.configureWarn {
background-image:url(%RESOURCEURI%icon_warn_white.gif);
background-image:url(%RESOURCEURI%icon_warn.png);
}
div.configureOk {
background-image:url(%RESOURCEURI%icon_ok_white.gif);
background-image:url(%RESOURCEURI%icon_ok.png);
}

a.configureWarn:link,
Expand Down
Binary file removed core/lib/Foswiki/Configure/resources/warning.gif
Binary file not shown.
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Configure/templates/feedbackerror.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</head>
<body>
<div class="configureFeedbackError">
<h1><img src="%RESOURCEURI%icon_error_white.gif">This session is not valid</h1>
<h1><img src="%RESOURCEURI%icon_error.png">This session is not valid</h1>
<p><p><p>
<strong>Please refresh your browser window and try again.</strong>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Configure/templates/feedbackunsaved.tmpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Template used for Feedback pending summary div -->
<#-- Template used for Feedback pending summary div -->

<#assign pendingList>
<span class="configureFeedbackUnsaved"><br />
Expand Down
8 changes: 8 additions & 0 deletions core/lib/Foswiki/Configure/templates/main.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@
<#if totalErrors??><span class='configureStatusErrors'>${totalErrors}</span></#if>
<#if totalWarnings??><span class='configureStatusWarnings'>${totalWarnings}</span></#if>
<#if firstTime == 1>(we will solve this in a minute)</#if>

<input type="hidden" disabled="disabled"
id="configureFeedbackWorkingText"
title="I18n - Not form data"
value="Working...">
<span class="configureFeedbackSummaryTable">
<span class="configureFeedbackSummaryCell" id="{ConfigureGUI}{Unsaved}status"></span>
</span>
</div>
<input type='submit' class='foswikiButton' name='changePassword' value='Change password' />
<input type='submit' class='enableWhenSomethingChanged foswikiSubmit' name='action' value='Save changes' />
Expand Down
9 changes: 0 additions & 9 deletions core/lib/Foswiki/Configure/templates/pagebegin.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,6 @@
</div>
</div>
</#if>
<input type="hidden" disabled="disabled"
id="configureFeedbackWorkingText"
title="I18n - Not form data"
value="Working...">
<div class="configureFeedbackSummaryTable">
<div class="section">
<div class="configureFeedbackSummaryCell" id="{ConfigureGUI}{Unsaved}status"></div>
</div>
</div>

<form method="post" action="${formAction}" enctype="multipart/form-data" name="update">
<input type="hidden" name="time" value="${time}" />

0 comments on commit 0b425de

Please sign in to comment.