2011-06-10 21:55:32 +00:00 · 2011-06-10 21:55:32 +00:00 · f7a7c71f86
Commit f7a7c71f86
--- a/application/views/scripts/install/badversion.phtml
+++ b/application/views/scripts/install/badversion.phtml
@ -0,0 +1,13 @@
+<?php
+$lang = Msd_Language::getInstance();
+?>
+<table class="bdr" style="width:70%" summary="Installation error - old version of MySQL or PHP">
+<tr class="thead"><th><?php echo $lang->L_ERROR;?></th></tr>
+<tr>
+    <td>
+        <div class="error" id="installError" style="padding:12px;">
+            <?php echo $this->message; ?>
+        </div>
+    </td>
+</tr>
+</table>
--- a/application/views/scripts/install/index.phtml
+++ b/application/views/scripts/install/index.phtml
@ -0,0 +1,128 @@
+<?php
+$currentLanguage = $this->language;
+$fallbackLanguage = $currentLanguage;
+$languages = $this->languages;
+$baseLangFile = APPLICATION_PATH . DS . 'language' . DS . '%s' . DS . 'lang.php';
+?>
+<script type="text/javascript">
+function changeLang(lang)
+{
+    document.location.href = '<?php echo $this->baseUrl(); ?>/install/index/language/' + lang + '/';
+}
+var langUrl = <?php
+echo json_encode($this->url(array(
+    'controller' => 'install',
+    'action' => 'ajax',
+    'lang' => '',
+)));
+?>;
+var throbberImgSrc = '<?php echo $this->baseUrl(); ?>/css/msd/icons/ajax-loader.gif';
+var okImgSrc = '<?php echo $this->getIconSrc('Ok', 16); ?>';
+var failImgSrc = '<?php echo $this->getIconSrc('Attention', 16); ?>';
+var installedText = new Array();
+var failedText = new Array();
+var updateText = new Array();
+<?php
+foreach ($languages as $langId => $language) {
+    if (file_exists(sprintf($baseLangFile, $langId))) {
+        $this->lang->loadLanguage($langId);
+    } else {
+        $this->lang->loadLanguage($fallbackLanguage);
+    }
+?>
+installedText['<?php echo $langId; ?>'] = '<?php echo $this->lang->L_INSTALLED; ?>';
+failedText['<?php echo $langId; ?>'] = '<?php echo $this->lang->L_ERROR; ?>';
+updateText['<?php echo $langId; ?>'] = '<?php echo $this->lang->L_UPDATE; ?>';
+<?php
+}
+$this->lang->loadLanguage($currentLanguage);
+?>
+var oldHtml = '';
+function dlLanguageFile(language)
+{
+    $('#status-icon-' + language).attr('src', throbberImgSrc);
+    $('#status-' + language).html(updateText[language]);
+    $('#update-button-' + language).attr('disabled', 'disabled');
+    $.getJSON(langUrl + language, function(objResult) {
+        if (objResult.success) {
+            $('#status-icon-' + objResult.language).attr('src', okImgSrc);
+            $('#status-' + objResult.language).html(installedText[objResult.language]);
+            $('#lang-' + objResult.language).removeAttr('disabled');
+            changeLang(objResult.language);
+        } else {
+            $('#status-icon-' + objResult.language).attr('src', failImgSrc);
+            $('#status-' + objResult.language).html(failedText[objResult.language]);
+            $('#lang-' + objResult.language).attr('disabled', 'disabled');
+        }
+        $('#update-button-' + objResult.language).removeAttr('disabled');
+        if (objResult.error.message) {
+            $('#container').append(objResult.error.message);
+            $('#update-message').dialog({"modal": 1,"dialogClass": "error","buttons": {"OK": function() {$(this).dialog('close');}},"position": {"0": "center","1": "center"},"title": "<?php echo $this->lang->L_INSTALL; ?>"});
+        }
+    });
+}
+</script>
+<form id="langform" action="<?php
+echo $this->url(
+    array(
+        'controller' => 'install',
+        'action' => 'index',
+    ),
+    null,
+    true
+);?>" method="post" enctype="multipart/formdata">
+<table cellpadding="0" cellspacing="0" border="0" class="bdr" style="width: 700px;" summary="Select language">
+    <tr class="thead">
+        <td colspan="5" style="text-align:center;">
+            <button type="submit" class="Formbutton" style="margin:12px;"><?php echo $this->getIcon('save');?> <?php echo $this->lang->L_SAVEANDCONTINUE;?></button>
+        </td>
+    </tr>
+    <tr class="thead">
+        <th class="right">#</th>
+        <th><?php echo $this->lang->L_LANGUAGE;?></th>
+        <th colspan="2"><?php echo $this->lang->L_STATUS;?></th>
+        <th><?php echo $this->lang->L_ACTION;?></th>
+    </tr>
+<?php
+$counter = 1;
+asort($languages);
+foreach ($languages as $langId => $language) {
+    if (file_exists(sprintf($baseLangFile, $langId))) {
+        $this->lang->loadLanguage($langId);
+    } else {
+        $this->lang->loadLanguage($fallbackLanguage);
+    }
+    if ($langId == $this->language) {
+        $checked = ' checked="checked"';
+    } else {
+        $checked = '';
+    }
+?>
+    <tr class="row-<?php echo (($counter % 2) == 0) ? 'odd' : 'even'; ?>">
+        <td class="right"><?php echo $counter; ?>.</td>
+        <td class="nowrap"><div id="lang_line_<?php echo $counter; ?>">
+            <input type="radio" class="radio" name="language" value="<?php echo $langId; ?>" id="lang-<?php echo $langId; ?>"<?php echo $language['installed'] ? '' : ' disabled="disabled"'; ?> onclick="changeLang('<?php echo $langId; ?>');"<?php echo $checked; ?> />
+            <label for="lang-<?php echo $langId; ?>"><img src="<?php echo $this->baseUrl(); ?>/flag.php?langId=<?php echo $langId; ?>" alt=""/> <?php echo $language['langName']; ?></label>
+        </div></td>
+        <td><img src="<?php
+        echo $language['installed'] ? $this->getIconSrc('Ok', 16) : $this->getIconSrc('Attention', 16);
+        ?>" id="status-icon-<?php echo $langId; ?>" alt=""/></td>
+        <td id="status-<?php echo $langId; ?>"><?php
+        echo $language['installed'] ? $this->lang->L_INSTALLED : $this->lang->L_NOTAVAIL;
+        ?></td>
+        <td style="text-align:center;"><button id="update-button-<?php echo $langId; ?>" type="button" class="Formbutton" onclick="dlLanguageFile('<?php echo $langId; ?>');" style="width:150px;"><?php echo $this->getIcon('Sync', '', 16); ?> <?php echo $this->lang->L_UPDATE; ?></button></td>
+    </tr>
+<?php
+    $counter++;
+}
+$this->lang->loadLanguage($currentLanguage);
+?>
+    <tr class="thead">
+        <td colspan="5" style="text-align:center;">
+            <button type="submit" class="Formbutton" style="margin:12px;"><?php echo $this->getIcon('save');?> <?php echo $this->lang->L_SAVEANDCONTINUE;?></button>
+        </td>
+    </tr>
+</table>
+<div id="langDl" title="Language Download">
+</div>
+</form>
--- a/application/views/scripts/install/step2.phtml
+++ b/application/views/scripts/install/step2.phtml
@ -0,0 +1,37 @@
+<table cellpadding="0" cellspacing="0" class="bdr" summary="Show write status of directories">
+    <tr class="thead">
+        <th><?php echo $this->lang->L_DIR; ?></th>
+        <th colspan="2"><?php echo $this->lang->L_STATUS; ?></th>
+        <th>&nbsp;</th>
+    </tr>
+<?php
+$counter = 1;
+foreach ($this->status as $directory => $statusInfo) {
+    $rowClass = 'row-' . ((($counter % 2) == 0)? 'odd' : 'even');
+    if (!$statusInfo['exists'] ||
+        !$statusInfo['writable'] ||
+        $statusInfo['chmod'] != '0777'
+    ) {
+        $icon = $this->getIcon('delete');
+    } else {
+        $icon = $this->getIcon('Ok', null, 16);
+    }
+?>
+    <tr class="<?php echo $rowClass; ?>">
+        <td rowspan="3"><?php echo $directory; ?></td>
+        <td>Exists</td>
+        <td><?php echo $statusInfo['exists'] ? 'yes' : 'no'; ?></td>
+        <td rowspan="3"><?php echo $icon; ?></td>
+    </tr>
+    <tr class="<?php echo $rowClass; ?>">
+        <td>Writable</td>
+        <td><?php echo $statusInfo['writable'] ? 'yes' : 'no'; ?></td>
+    </tr>
+    <tr class="<?php echo $rowClass; ?>">
+        <td>chmod</td>
+        <td><?php echo $statusInfo['chmod']; ?></td>
+    </tr>
+<?php
+    $counter++;
+}
+?></table>
--- a/application/views/scripts/install/step3.phtml
+++ b/application/views/scripts/install/step3.phtml
@ -0,0 +1,18 @@
+<form action="<?php echo $this->url(array(
+    'controller' => 'install',
+    'action' => 'step3',
+), null, true);
+?>" method="post" enctype="multipart/formdata">
+    <table cellpadding="0" cellspacing="0" class="bdr" style="width: 700px;" summary="Provide admin user account">
+    <tr class="thead left">
+        <th colspan="2">
+            <h2><?php echo $this->lang->L_NOTICE;?></h2>
+            <?php echo $this->lang->L_REGISTRATION_DESCRIPTION; ?>
+            <br /><br />
+        </th>
+    </tr>
+    <?php
+    echo $this->form;
+    ?>
+    </table>
+</form>
--- a/application/views/scripts/install/step4.phtml
+++ b/application/views/scripts/install/step4.phtml
@ -0,0 +1,128 @@
+<form action="<?php
+echo $this->url(array(
+    'controller' => 'install',
+    'action' => 'step4',
+));
+
+$okIcon = $this->getIcon('Ok', null, 16);
+$request = Zend_Controller_Front::getInstance()->getRequest();
+
+?>" method="post" enctype="multipart/formdata">
+<table cellpadding="0" cellspacing="0" class="bdr" style="width: 700px;" summary="Provide MySQL access data">
+<?php
+if (isset($this->success) && $this->success) {
+?>
+    <tr class="thead">
+        <td style="text-align:center;" colspan="2">
+            <br />
+            <button class="Formbutton" type="submit">
+                <?php echo $this->getIcon('save'); ?> <?php echo $this->lang->L_SAVEANDCONTINUE; ?>
+            </button><br class="clear" /><br />
+        </td>
+    </tr>
+<?php
+}
+?>
+    <tr class="row-even">
+        <td><?php echo $this->lang->L_DB_HOST; ?>:</td>
+        <td><input type="text" class="text" name="host" maxlength="100" style="width:250px;"
+            value="<?php echo $request->getParam('host', 'localhost'); ?>"
+            autocomplete="off" /></td>
+    </tr>
+    <tr class="row-odd">
+        <td><?php echo $this->lang->L_DB_USER; ?>:</td>
+        <td><input type="text" class="text" name="user" maxlength="100" style="width:250px;"
+            value="<?php echo $request->getParam('user', 'root'); ?>"
+            autocomplete="off" /></td>
+    </tr>
+    <tr class="row-even">
+        <td><?php echo $this->lang->L_DB_PASS; ?>:</td>
+        <td><input type="password" class="text" name="pass" maxlength="100" style="width:250px;"
+            value="<?php echo $request->getParam('pass', ''); ?>"
+            autocomplete="off" /></td>
+    </tr>
+    <tr class="row-odd">
+        <td><?php echo $this->lang->L_DB; ?>:
+        <p class="small"><?php echo $this->lang->L_ENTER_DB_INFO; ?></p></td>
+        <td><input type="text" class="text" name="manual" maxlength="100" style="width:250px;" value="<?php echo $request->getParam('manual', ''); ?>" /></td>
+    </tr>
+    <tr class="row-even">
+        <td><?php echo $this->lang->L_PORT; ?>:
+        <p class="small"><?php echo $this->lang->L_INSTALL_HELP_PORT; ?></p></td>
+        <td><input type="text" class="text" name="port" maxlength="100" style="width:250px;" value="<?php echo $request->getParam('port', ''); ?>" /></td>
+    </tr>
+    <tr class="row-odd">
+        <td><?php echo $this->lang->L_SOCKET; ?>:
+        <p class="small"><?php echo $this->lang->L_INSTALL_HELP_SOCKET; ?></p></td>
+        <td><input type="text" class="text" name="socket" maxlength="100" style="width:250px;" value="<?php echo $request->getParam('socket', ''); ?>" /></td>
+    </tr>
+    <tr class="row-even">
+        <td><?php echo $this->lang->L_TESTCONNECTION; ?>:</td>
+        <td><button type="submit" class="Formbutton">
+            <?php echo $this->getIcon('Connect', null, 16); ?> <?php echo $this->lang->L_CONNECTTOMYSQL; ?>
+        </button></td>
+    </tr>
+</table>
+<?php
+if(isset($this->success)) {
+?><br/><br/>
+<table class="bdr" cellpadding="0" cellspacing="0" style="width:700px;" summary="MySQL connection results">
+<?php
+    if ($this->success) {
+?>
+    <tr class="thead">
+        <th><?php echo $this->lang->L_DBCONNECTION; ?> <?php echo $okIcon; ?></th>
+    </tr>
+<?php
+        if (count($this->databases) > 0) {
+            foreach ($this->databases as $database) {
+?>
+    <tr class="dbrow">
+        <td class="small success">
+                <div style="float:left; padding-right: 5px;" title="<?php echo $this->lang->L_INSTALL_DB_DEFAULT; ?>">
+                        <input type="radio" name="defaultDb" value="<?php echo $database; ?>" />
+                </div>
+                <?php echo $database; ?>
+                <div style="float:right;">
+                       <?php echo $okIcon; ?>
+                </div>
+        </td>
+    </tr>
+<?php
+            }
+        } else {
+?>
+    <tr>
+        <td><?php echo $okIcon; ?> <?php echo $this->lang->L_NO_DB_FOUND_INFO; ?></td>
+    </tr>
+<?php
+        }
+?>
+    <tr class="thead">
+        <td style="text-align:center;">
+            <br />
+            <button class="Formbutton" type="submit">
+                <?php echo $this->getIcon('save'); ?> <?php echo $this->lang->L_SAVEANDCONTINUE; ?>
+            </button><br class="clear" /><br />
+            <input type="hidden" name="save" value="1"/>
+        </td>
+    </tr>
+<?php
+    } else {
+?>
+    <tr class="thead">
+        <th><?php echo $this->lang->L_DBCONNECTION; ?> <?php echo $this->getIcon('delete'); ?></th>
+    </tr>
+    <tr>
+        <td class="error">
+            <br /><?php echo $this->errorMessage; ?><br /><br/>
+        </td>
+    </tr>
+<?php
+    }
+?>
+</table>
+<?php
+}
+?>
+</form>
--- a/application/views/scripts/install/stepIndicator.phtml
+++ b/application/views/scripts/install/stepIndicator.phtml
@ -0,0 +1,27 @@
+<?php
+$lang = Msd_Language::getInstance();
+$language = isset($this->language) ? $this->language : '';
+$firstStepOk = $secondStepOk = $thirdStepOk = $fourthStepOk = '';
+$imageOk = $this->getIcon('Ok', null, 16);
+if ($this->firstStepOK) {
+    $firstStepOk = $imageOk;
+}
+if ($this->secondStepOK) {
+    $secondStepOk = $imageOk;
+}
+if ($this->thirdStepOK) {
+    $thirdStepOk = $imageOk;
+}
+if ($this->fourthStepOK) {
+    $fourthStepOk = $imageOk;
+}
+?>
+<table cellspacing="0" cellpadding="0" border="0" class="bdr" summary="Show active installation step">
+    <tr class="row-even">
+        <td><?php echo $lang->L_STEP;?> 1: <span class="small"><?php echo $lang->L_SELECT_LANGUAGE;?> (<?php echo$this->language;?>)</span><?php echo $firstStepOk;?></td>
+        <td><?php echo $lang->L_STEP;?> 2: <span class="small"><?php echo $lang->L_CHECK_DIRS;?></span><?php echo $secondStepOk;?></td>
+        <td><?php echo $lang->L_STEP;?> 3: <span class="small"><?php echo $lang->L_AUTHENTICATE;?></span><?php echo $thirdStepOk;?></td>
+        <td><?php echo $lang->L_STEP;?> 4: <span class="small"><?php echo $lang->L_DBPARAMETER;?></span><?php echo $fourthStepOk;?></td>
+    </tr>
+</table><br/>
+<h3><?php echo $lang->L_STEP ?> <?php echo $this->stepInfo['number'];?>: <?php echo $this->stepInfo['description'];?></h3>