From: Bharat M. <bh...@us...> - 2004-11-12 08:11:37
|
Update of /cvsroot/gallery/gallery2/install/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22787/templates Modified Files: AuthenticateRequest.html CreateConfigFileFailed.html CreateConfigFileInstructions.html InstallOtherModulesRequest.html InstallOtherModulesSuccess.html MainPage.html Secure.html StorageSetupRequest.html Log Message: * Install Other Modules step now shows you the modules you've already installed, but they're greyed out so that you can't uninstall them. * Got rid of double "Go to step 9" on Install Other Modules step * Added Windows and Unix permissions examples in the Storage Setup step * Changed "Go to Step xx" to "Continue to Step xx" so it's clear that you're moving forward * Fixed the way that that we show the left side menu so that we don't get gaps in the checkboxes when you skip an optional step. Index: StorageSetupRequest.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/StorageSetupRequest.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- StorageSetupRequest.html 7 Aug 2004 06:43:47 -0000 1.3 +++ StorageSetupRequest.html 12 Nov 2004 08:11:23 -0000 1.4 @@ -1,11 +1,7 @@ <h1><?php print _("Storage Setup") ?></h1> <p> - <?php print _("Gallery needs to store data in a directory on your server. It will use this directory to store your images as well as other important data. For security, we suggest that you place this directory <b>outside</b> the path to your webserver (document root), so that it cannot be accessed directly via the web. This is necessary if you wish to have your images accessible only via Gallery<b>*</b>. Note that the default path provided below is inside the webserver area. Update with a secure location, such as a path under your user home directory, if possible. If you access your site via FTP, you might not have this option.") ?> - </p> - - <p> - <?php print _("The directory also needs to be writable by Gallery. For help with permissions, see <b>FutureLinkToSomewhere</b>?.") ?> + <?php print sprintf(_("Gallery needs to store data in a directory on your server. It will use this directory to store your images as well as other important data. For security, we suggest that you place this directory <b>outside</b> of your web site so that it cannot be browse directly via the web. This is necessary if you wish to have your images accessible only via Gallery [%s]. Note that the default path provided below is inside the webserver area. This is because we are unable to reliably guess a directory outside of your web site. You should update it with a secure location, such as a path under your user home directory, if possible. If you access your site via FTP, you might not have this option."), "<b><a href=\"#footnote_firewall\">*</a></b>"); ?> </p> <form name="storage_form" method="post"> @@ -42,14 +38,43 @@ </table> </form> - <p style="text-align: left;"> - <strong>*</strong> This is sometimes known as an <b>image firewall</b>. + <p> + <?php print _("Your webserver needs to be able to write to this directory. Permission systems vary from host to host. You can set a very relaxed set of permissions on this directory to get Gallery working, but if you're concerned about security you should consult your system adminstrator to figure out how to make this as secure as possible. To get it working, you can follow these examples.") ?> + <br/> + <i> + <?php print _("Note: these are only examples! You may find that they don't work quite right on your system.") ?> + </i> </p> + <?php if ($templateData['OS'] == 'unix'): ?> + <div class="example"> + <h2> <?php print _("Unix (with shell access)"); ?> </h2> + <pre> $ <b> <?php print sprintf(_("mkdir %s"), $templateData['dir']) ?> </b> <br/> $ <b> <?php print sprintf(_("chmod 777 %s"), $templateData['dir']) ?> </b> </pre> + </div> + + <div class="example"> + <h2> <?php print _("Unix (with ftp access)"); ?> </h2> + <i> <?php print _("Note that ftp servers and clients vary so these instructions may not work for you. Consult the manual for your FTP client or talk to a system administrator for help with this if you have problems") ?> </i> <br/> + <pre> ftp> <b> <?php print sprintf(_("cd %s"), dirname($templateData['dir'])) ?></b><br/> ftp> <b> <?php print sprintf(_("mkdir %s"), basename($templateData['dir'])) ?> </b> <br/> ftp> <b> <?php print sprintf(_("chmod 777 %s"), basename($templateData['dir'])) ?> </b> </pre> + </div> + + <?php else: ?> + + <div class="example"> + <h2> Windows </h2> + <pre> C:\> <b> <?php print sprintf(_("mkdir %s"), $templateData['dir']) ?></b></pre> + </div> + + <?php endif; ?> <div class="go"> <span class="goToNext"> <a href="javascript:document.storage_form.submit()"><?php print _('Save') ?></a> </span> </div> + <hr/> + + <p style="text-align: left;"> + <strong><a name="footnote_firewall">*</a></strong> <?php print _("This is sometimes known as an <b>image firewall</b>.") ?> + </p> Index: CreateConfigFileFailed.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/CreateConfigFileFailed.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CreateConfigFileFailed.html 16 Jul 2004 05:32:10 -0000 1.2 +++ CreateConfigFileFailed.html 12 Nov 2004 08:11:23 -0000 1.3 @@ -10,8 +10,8 @@ <div class="go"> <span class="GoToNextL"> - <a href="?step=<?php echo $currentStep->getStepNumber()?>"> - <?php echo _('Try Again') ?> + <a href="?step=<?php print $currentStep->getStepNumber()?>"> + <?php print _('Try Again') ?> </a> </span> </div> Index: CreateConfigFileInstructions.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/CreateConfigFileInstructions.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CreateConfigFileInstructions.html 8 Nov 2004 07:50:40 -0000 1.1 +++ CreateConfigFileInstructions.html 12 Nov 2004 08:11:23 -0000 1.2 @@ -15,8 +15,8 @@ <div class="go"> <span class="GoToNextL"> - <a href="?step=<?php echo $currentStep->getStepNumber()?>"> - <?php echo _('Create config file') ?> + <a href="?step=<?php print $currentStep->getStepNumber()?>"> + <?php print _('Create config file') ?> </a> </span> </div> Index: AuthenticateRequest.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/AuthenticateRequest.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AuthenticateRequest.html 17 Aug 2004 04:59:56 -0000 1.3 +++ AuthenticateRequest.html 12 Nov 2004 08:11:23 -0000 1.4 @@ -16,8 +16,8 @@ <div class="go"> <span class="GoToNextL"> - <a href="?step=<?php echo $currentStep->getStepNumber()?>"> - <?php echo _('Authenticate Me') ?> + <a href="?step=<?php print $currentStep->getStepNumber()?>"> + <?php print _('Authenticate Me') ?> </a> </span> </div> Index: InstallOtherModulesSuccess.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/InstallOtherModulesSuccess.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- InstallOtherModulesSuccess.html 21 Oct 2004 21:39:54 -0000 1.1 +++ InstallOtherModulesSuccess.html 12 Nov 2004 08:11:23 -0000 1.2 @@ -18,3 +18,19 @@ <?php print _("After finishing this installation, login as Admin and browse to Site Admin. Go to the <i>Modules</i> view and configure the above listed modules."); ?> </p> <?php endif; ?> + + <div class="go"> + <span class="goToNext"> + <a href="index.php?step=<?php print $currentStep->getStepNumber() ?>"> + <?php print _('Activate More Modules'); ?> + </a> + </span> + <?php $nextStep = $stepNumber + 1 ?> + <span class="goToNextL"> + <a href="index.php?step=<?php print $nextStep ?>"> + <?php printf(_('Continue to Step %d»'), $nextStep); ?> + </a> + </span> + </div> + + Index: MainPage.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/MainPage.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- MainPage.html 8 Oct 2004 04:27:47 -0000 1.11 +++ MainPage.html 12 Nov 2004 08:11:23 -0000 1.12 @@ -16,7 +16,7 @@ <?php for ($i = 0; $i < sizeof($steps); $i++): ?> <li class="navitem"> <span class="nav_num"> - <?php if ($steps[$i]->isComplete()): ?> + <?php if ($i <= $currentStep->getStepNumber() && ($steps[$i]->isComplete() || $steps[$i]->isOptional())): ?> <span class="success">√</span> <?php elseif ($steps[$i]->isInError()): ?> <span class="error">✗</span> @@ -26,11 +26,21 @@ </span> <span class="nav_text"> - <?php if ($i == 0 || $steps[$i-1]->isComplete()): ?> - <a href="?step=<?php echo $i?>"> + <?php + if ($i == 0 || + ($i <= $currentStep->getStepNumber()+1 && + ($steps[$i-1]->isComplete() || + $steps[$i-1]->isOptional()))) { + $linkable = true; + } else { + $linkable = false; + } + ?> + <?php if ($linkable): ?> + <a href="?step=<?php print $i?>"> <?php endif; ?> <?php print $steps[$i]->stepName(); ?> - <?php if ($i == 0 || $steps[$i-1]->isComplete()): ?> + <?php if ($linkable): ?> </a> <?php endif; ?> </span> @@ -66,14 +76,14 @@ <div class="go"> <?php $nextStep = $stepNumber + 1 ?> <span class="goToNext"> - <a href="index.php?step=<?php echo $nextStep?>"> - <?php printf(_('Go to Step %d»'), $nextStep); ?> + <a href="index.php?step=<?php print $nextStep?>"> + <?php printf(_('Continue to Step %d»'), $nextStep); ?> </a> </span> <?php if ($currentStep->isRedoable()): ?> <span class="goToNextL"> - <a href="index.php?step=<?php echo $stepNumber?>&doOver=1"> + <a href="index.php?step=<?php print $stepNumber?>&doOver=1"> <?php print _('Redo this step'); ?> </a> </span> @@ -93,20 +103,20 @@ <tr> <?php $progressBarColor = ($templateData['percentComplete'] >= 100) ? '#fd6704' : '#fd6704'; ?> <?php if ($templateData['percentComplete'] != 0): ?> - <td width="<?php echo $templateData['percentComplete'] ?>%" + <td width="<?php print $templateData['percentComplete'] ?>%" align="center" bgcolor="<?php print $progressBarColor; ?>" style="border: 1px solid #ddd"> </td> <?php endif; ?> <?php if ($templateData['percentComplete'] != 100): ?> - <td width="<?php echo 100 - $templateData['percentComplete'] ?>%" + <td width="<?php print 100 - $templateData['percentComplete'] ?>%" bgcolor="#eeeeee" - style="border: 1px solid #ddd; <?php echo ($templateData['percentComplete'] == 0) ? '' : 'border-left: 0px;'?>"> </td> + style="border: 1px solid #ddd; <?php print ($templateData['percentComplete'] == 0) ? '' : 'border-left: 0px;'?>"> </td> <?php endif; ?> </tr> <tr> - <td <?php echo ($templateData['percentComplete'] != 0 && $templateData['percentComplete'] != 100) ? 'colspan="2"' : '';?> > + <td <?php print ($templateData['percentComplete'] != 0 && $templateData['percentComplete'] != 100) ? 'colspan="2"' : '';?> > <span class="statusLine"> <?php print _('Install ') . $templateData['percentComplete'] ._('% complete')?> </span> @@ -116,7 +126,7 @@ </div> </div> <div id="footer"> - <?php echo _('Gallery: <strong>your photos</strong> on <strong>your website</strong>') ?> + <?php print _('Gallery: <strong>your photos</strong> on <strong>your website</strong>') ?> » <a target="_blank" href="http://gallery.sourceforge.net/">gallery.sourceforge.net</a> </div> </body> Index: Secure.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/Secure.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Secure.html 19 Aug 2004 06:46:48 -0000 1.1 +++ Secure.html 12 Nov 2004 08:11:23 -0000 1.2 @@ -15,7 +15,7 @@ <div class="go"> <span class="goToNext"> - <a href="?step=<?php echo $currentStep->getStepNumber()?>"> <?php echo _('Check Again') ?> </a> + <a href="?step=<?php print $currentStep->getStepNumber()?>"> <?php echo _('Check Again') ?> </a> </span> </div> <?php endif; ?> Index: InstallOtherModulesRequest.html =================================================================== RCS file: /cvsroot/gallery/gallery2/install/templates/InstallOtherModulesRequest.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- InstallOtherModulesRequest.html 21 Oct 2004 21:39:54 -0000 1.1 +++ InstallOtherModulesRequest.html 12 Nov 2004 08:11:23 -0000 1.2 @@ -1,6 +1,5 @@ <h1><?php print _("Install Other Modules") ?></h1> - <?php if (! $templateData['isComplete']): ?> <script type="text/javascript"> function checkAll(newValue) { for (var i = 0; i < document.forms[0].length; i++) { @@ -42,22 +41,32 @@ </tr> <?php $counter = 0; ?> <?php foreach ($modules as $id => $module): ?> + <?php $isInstalled = $templateData['moduleInstalled'][$id]; ?> <tr<?php if ($counter % 2 == 0) print ' style="background:#eee;"' ?>> <td> <input type=checkbox name="module[<?php print $id ?>]" - <?php if ($module->isRecommendedDuringInstall()): ?> + <?php if ($module->isRecommendedDuringInstall() || $isInstalled): ?> checked="checked" <?php endif; ?> + <?php if ($isInstalled): ?> + disabled="disabled" + <?php endif; ?> /> </td> <td class="modules"> - <?php print $module->getName() ?> + <?php if ($isInstalled): ?> <span class="disabled"> <?php endif; ?> + <?php print $module->getName() ?> + <?php if ($isInstalled): ?> </span> <?php endif; ?> </td> <td> - <?php print $module->getVersion() ?> + <?php if ($isInstalled): ?> <span class="disabled"> <?php endif; ?> + <?php print $module->getVersion() ?> + <?php if ($isInstalled): ?> </span> <?php endif; ?> </td> <td> - <?php print $module->getDescription() ?> + <?php if ($isInstalled): ?> <span class="disabled"> <?php endif; ?> + <?php print $module->getDescription() ?> + <?php if ($isInstalled): ?> </span> <?php endif; ?> </td> </tr> <?php $counter++; ?> @@ -76,7 +85,6 @@ <input type="hidden" name="step" value="<?php print $currentStep->getStepNumber() ?>"/> <input type="hidden" name="activate" value="1"/> </form> - <?php endif; ?> <div class="go"> <span class="goToNext"> @@ -84,8 +92,8 @@ </span> <?php $nextStep = $stepNumber + 1 ?> <span class="goToNextL"> - <a href="index.php?step=<?php echo $nextStep?>"> - <?php printf(_('Go to Step %d»'), $nextStep); ?> + <a href="index.php?step=<?php print $nextStep?>"> + <?php printf(_('Continue to Step %d»'), $nextStep); ?> </a> </span> </div> |