Skip to content

Commit

Permalink
Item12180: different action button color; new legend
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@15900 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 4, 2012
1 parent 85dc2fb commit 7d32385
Show file tree
Hide file tree
Showing 5 changed files with 261 additions and 270 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 @@ -112,7 +112,7 @@ qq{ <input type="button" id="${keys}feedreq$n" value=$q$fb$q class="configureFee
}
$feedback = $buttons;
$index =
qq{$index <span class="configureCheckOnChange"><img src="${Foswiki::resourceURI}autocheck.png" width="32" height="15" title="This field will be automatically verified when you change it" alt="Autochecked field"></span>}
qq{$index <span class="configureCheckOnChange"><img src="${Foswiki::resourceURI}autocheck.png" title="This field will be automatically verified when you change it" alt="Autochecked field"></span>}
if ( $nd != $n );
}
else {
Expand Down
69 changes: 31 additions & 38 deletions core/lib/Foswiki/Configure/resources/intro.html
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
<div class="yui-g">
<div class="yui-g first">
<div class="yui-u first">
<h3>Is this a new site?</h3>
<p>Continue your setup with the <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/InstallationGuidePart2">Installation Guide Part 2</a></p>

<p>You will also need to consider how you are going to manage
authentication and access control.</p>

<p>See the reference manual sections on <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/UserAuthentication">
authentication</a> and
<a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/AccessControl">
access control</a>, and the 'Security' section.</p>
</div>

<div class="yui-u">
<h3>If your Foswiki site is already working</h3>
<p><a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/WebHome">Go to your Foswiki's start page</a></p>

<h4>How to become an administrator</h4>
<p>You need to first <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/UserRegistration">
register</a> as a normal user and then go to <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%USERSWEB%/%ADMINGROUP%">
%ADMINGROUP%</a> and add yourself to the GROUP setting (follow the text in yellow).</p>
</div>
<div class="yui-gb">
<div class="yui-u first">
<h3>Is this a new site?</h3>
<p>Continue your setup with the <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/InstallationGuidePart2">Installation Guide Part 2</a></p>

<p>You will also need to consider how you are going to manage
authentication and access control.</p>

<p>See the reference manual sections on <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/UserAuthentication">
authentication</a> and
<a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/AccessControl">
access control</a>, and the 'Security' section.</p>
</div>

<div class="yui-g">
<div class="yui-u first">
<h3>Troubleshooting</h3>
<h4>If you are on a non-standard platform or environment</h4>
<p>There are a lot of <a href="http://foswiki.org/Support/SupplementalDocuments">supplemental documents</a> on Foswiki.org</p>

<h4>If you get stuck</h4>
<p>There is a lot of support available at the
<a href="http://foswiki.org/Support/WebHome">Support forum</a>.</p>
</div>
<div class="yui-u">
%INCLUDE{legend.html}%
</div>
<div class="yui-u">
<h3>If your Foswiki site is already working</h3>
<p><a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/WebHome">Go to your Foswiki's start page</a></p>

<h4>How to become an administrator</h4>
<p>You need to first <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%SYSTEMWEB%/UserRegistration">
register</a> as a normal user and then go to <a rel="nofollow" href="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%USERSWEB%/%ADMINGROUP%">
%ADMINGROUP%</a> and add yourself to the GROUP setting (follow the text in yellow).</p>
</div>
<div class="yui-u">
<h3>Troubleshooting</h3>
<h4>If you are on a non-standard platform or environment</h4>
<p>There are a lot of <a href="http://foswiki.org/Support/SupplementalDocuments">supplemental documents</a> on Foswiki.org</p>

<h4>If you get stuck</h4>
<p>There is a lot of support available at the
<a href="http://foswiki.org/Support/WebHome">Support forum</a>.</p>
</div>
</div>

%INCLUDE{"legend.html"}%
108 changes: 61 additions & 47 deletions core/lib/Foswiki/Configure/resources/legend.html
Original file line number Diff line number Diff line change
@@ -1,49 +1,63 @@
<h3>Explanation of colours and symbols</h3>
<div class="configureLegend">
<div class="item">
<div class='configureMessageBox'>{DefaultUrlHost}&nbsp;<span class='configureMandatory'>required</span></div>
<p>
<strong>Required settings</strong><br />
Must have a value
</p>
</div>
<div class="yui-gb">

<div class="item">
<div class='configureMessageBox'>{LoginNameFilterIn} <span class="configureCheckOnChange"><img src="%RESOURCEURI%autocheck.png" width="32" height="15" title="This field will be automatically verified when you change it" alt="Autochecked field"></span></div>
<p><strong>Auto-checked</strong><br />
Field is automatically checked when changed</p>
</div>

<div class="item">
<div class='configureMessageBox'>{PubDir}<br />
<a href="#" class="configureFeedbackButton1">Validate</a></div>
<p>
<strong>Action button</strong><br />
Click button to perform a validation, repair or other action for this item.
</p>
</div>

<div class="item">
<div class='configureMessageBox foswikiAlert configureError'><span><strong>Error</strong></div>
<p>
<strong>Errors</strong><br />
Must be fixed
</p>
</div>

<div class="item">
<div class='configureMessageBox foswikiAlert configureWarn'><span><strong>Warning</strong></div>
<p>
<strong>Warnings</strong><br />
Non-fatal, but often a good indicator that something is wrong
</p>
</div>

<div class="item">
<div class='configureMessageBox foswikiAlert configureExpertExample'>{Validation}{Method}</div>
<p>
<strong>Expert settings</strong><br />
For expert use only. You should not fiddle with them unless you have read all the documentation first.
</p>
<div class="configureLegend">
<h3>Explanation of colours and symbols</h3>
<div class="yui-u first">
<div class="item">
<strong>Required settings</strong>
<div class='configureMessageBox'>{DefaultUrlHost}&nbsp;<span class='configureMandatory'>required</span></div>
<p>
Must have a value.
</p>
</div>

<div class="item">
<strong>Expert settings</strong>
<div class='configureMessageBox configureExpert'>{Validation}{Method}</div>
<p>
For expert use only. You should not fiddle with them unless you have read all the documentation first.
</p>
</div>


</div>

<div class="yui-u">
<div class="item">
<strong>Warnings</strong>
<div class='configureMessageBox foswikiAlert configureWarn'><span><strong>Warning</strong></div>
<p>
Non-fatal, but often a good indicator that something is wrong.
</p>
</div>

<div class="item">
<strong>Errors</strong>
<div class='configureMessageBox foswikiAlert configureError'><span><strong>Error</strong></div>
<p>
Must be fixed.
</p>
</div>
</div>

<div class="yui-u">
<div class="item">
<strong>Action button</strong>
<div class='configureMessageBox'>{PubDir}<br />
<a href="#" class="configureFeedbackButton1">Validate</a></div>
<p>
Click button to perform a validation, repair or other action for this item.
</p>
</div>

<div class="item">
<strong>Auto-checked</strong>
<div class='configureMessageBox'>{LoginNameFilterIn} <span class="configureCheckOnChange"><img src="%RESOURCEURI%autocheck.png" title="This field will be automatically verified when you change it" alt="Autochecked field"></span></div>
<p>
Field is automatically checked when changed.
</p>
</div>
</div>
<div class="foswikiClear"></div>
</div>
</div>
</div>
Loading

0 comments on commit 7d32385

Please sign in to comment.