Commit 045ba14d authored by xavidp's avatar xavidp

[ENH]Admin wizard synchronized with the improved version in trunk, as agreed...

[ENH]Admin wizard synchronized with the improved version in trunk, as agreed weeks ago in the devel list. 
[bp/r49023]NULL               (I only backported the addition of img/icons/large/admin_panel48x48.png out of that commit r49023)
[bp/r49047][FIX] Hide the admin wizard toc on the front page. Avoid indicating that it is the required process steps
[bp/r49048][FIX] Make the wizard toc items for the profiles part link to the correct page.
[bp/r49052][ENH]Minor changes to make the config wizard dialog clearer and more consisten.
[bp/r49071][MOD]Fix consistency with icon size. Add '12' to the congratulations message about the Tiki instance so that it can be applicable for upgrades also. Add more spacing between the two first lines.
[bp/r49072][FIX] Do not hard-code the version number
[bp/r49073][FIX] wording. The recommendation is to start with "this approach". Not any of the others
parent 951ee934
......@@ -958,6 +958,7 @@ img/icons/key_active.png -text
img/icons/key_private.png -text
img/icons/large/accounting48x48.png -text
img/icons/large/admin.gif -text
img/icons/large/admin_panel48x48.png -text
img/icons/large/ads.png -text
img/icons/large/ads48x48.png -text
img/icons/large/areas.png -text
......
......@@ -7,10 +7,12 @@
<div id="wizardBody">
<table class="adminWizardTable">
<tr>
{if !empty($wizard_toc)}
<td class="adminWizardTOC">
<span class="adminWizardTOCTitle">{tr}Admin Wizard Steps{/tr}</span><br>
{$wizard_toc}
</td>
{/if}
<td class="adminWizardBody">
{include file="{$wizardBody}"}
</td>
......
......@@ -2,29 +2,48 @@
<fieldset>
<legend>{tr}Get Started{/tr}</legend>
<div style="display:block;margin-left: auto; margin-right: auto">
<div class="adminWizardIconleft"><img src="img/icons/large/wizard48x48.png" alt="{tr}Tiki Admin Wizard{/tr}" /><br/><br/></div>
{tr}The Tiki Admin Wizard helps you quickly configure key features and settings. Use the <a href="tiki-admin.php" target="_blank">Admin Panel</a> to configure other features and settings not included in this wizard{/tr}.
<br>
<input type="submit" class="btn btn-default" name="continue" value="{tr}Start admin wizard{/tr}" /><br>
</div>
<br>
<div style="display:block;margin-left: auto; margin-right: auto">
<div class="adminWizardIconleft"><img src="img/icons/large/profiles48x48.png" alt="{tr}Tiki Configuration Profiles{/tr}" /></div>
{tr}Tiki Profiles are a quick and easy way to setup a preconfigured application{/tr}.
{tr}Featured profiles: Collaborative Community, Company Intranet, Personal Blog and Profile and Small Organization Web Presence{/tr}.
<br>
<input type="submit" class="btn btn-default" name="use-default-prefs" value="{tr}Easy application setup using configuration profiles{/tr}" /><br>
</div>
<br>
<div style="display:block;margin-left: auto; margin-right: auto; margin-bottom: 10px">
<div class="adminWizardIconleft"><img src="img/icons/large/stock_missing-image48x48.png" alt="{tr}No wizard{/tr}" /></div>
{tr}Do it manually using the <a href="tiki-admin.php" target="_blank">Admin Panel</a>{/tr}.
<br>
<input type="submit" class="btn btn-default" name="skip" value="{tr}Skip setup and don't show again{/tr}" />
<br><br>
</div>
{tr _0=$tiki_version}Congratulations! You now have a working instance of Tiki %0{/tr}.<br><br>
{tr}You may <a href="tiki-index.php">start using it right away</a>, or you may configure it to better meet your needs, using one of the configuration helpers below.{/tr}
<br><br>
<table>
<tr>
<td><div class="adminWizardIconleft"><img src="img/icons/large/profiles48x48.png" alt="{tr}Tiki Template Sites{/tr}" /></div></td>
<td>
{tr}You may start by applying one of our <b>Featured Site Profiles</b>{/tr}.
{tr}Each of these provides a shrink-wrapped solution that meets most of the needs of a particular kind of community or site (ex: Personal Blog space, Company Intranet){/tr}.
{tr}If you are new to Tiki administration, we recommend that you start with this approach{/tr}.
{tr}If the profile you selected does not quite meet your needs, you will still have the option of customizing it further with one of the approaches below{/tr}.
<br>
<input type="submit" class="btn btn-default" name="use-default-prefs" value="{tr}Choose a Site Profile{/tr}" />
<br><br>
</td>
</tr>
<tr>
<td><div class="adminWizardIconleft"><img src="img/icons/large/wizard48x48.png" alt="{tr}Configuration Walkthrough{/tr}" /><br/><br/></div></td>
<td>
{tr}Alternatively, you may use the <b>Admin Wizard</b>{/tr}.
{tr}This will guide you through the most common preference settings in order to customize your site{/tr}.
{tr}Use this wizard if none of the <b>Site Profiles</b> look like a good starting point, or if you need to customize your site further{/tr}.
<br>
<input type="submit" class="btn btn-default" name="continue" value="{tr}Start Admin Wizard{/tr}" /><br><br>
</td>
</tr>
<tr>
<td><div class="adminWizardIconleft"><img src="img/icons/large/admin_panel48x48.png" alt="{tr}Admin Panel{/tr}" /></div></td>
<td>
{tr}Use the <b>Admin Panel</b> to manually browse through the full list of preferences{/tr}.
<br>
{button href="tiki-admin.php" _text="{tr}Go to the Admin Panel{/tr}"}
<br><br>
</td>
</tr>
</table>
</fieldset>
<fieldset>
<legend>{tr}Server Fitness{/tr}</legend>
{tr _0=$tiki_version}To check if your server meets the requirements for running Tiki version %0, please visit <a href="tiki-check.php" target="_blank">Tiki Server Compatibility Check</a>{/tr}.
......
......@@ -130,11 +130,14 @@ foreach ($pages as $page) {
// Start the admin wizard
$url = $base_url.'tiki-wizard_admin.php?&amp;stepNr=' . $stepNr . '&amp;url=' . rawurlencode($homepageUrl);
if ($useDefaultPrefs) {
$url .= '&amp;use-default-prefs=1';
}
$cnt = $stepNr+1;
if ($cnt <= 9) {
$cnt = '&nbsp;&nbsp;'.$cnt;
}
$toc .= $cnt.' '.'<a ';
$toc .= '<li><a ';
$cssClasses .= 'adminWizardTOCItem ';
if ($stepNr == $reqStepNr) {
$cssClasses .= 'highlight ';
......@@ -147,7 +150,7 @@ foreach ($pages as $page) {
$css = 'class="'.$cssClasses.'" ';
}
$toc .= $css;
$toc .= 'href="'.$url.'">'.$page->pageTitle().'</a><br>';
$toc .= 'href="'.$url.'">'.$page->pageTitle().'</a></li>';
$stepNr++;
}
......@@ -160,7 +163,9 @@ foreach ($pages as $page) {
JS
);
$smarty->assign('wizard_toc', $toc);
if ($reqStepNr > 0) {
$smarty->assign('wizard_toc', $toc);
}
// disallow robots to index page:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment