![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/plugins/generic/dashBoard/Register/register.tpl b/gosa-core/plugins/generic/dashBoard/Register/register.tpl
index 55e3d977fb50387f54df814d7bce595ef338d1f0..3d995604202ed8a5a12cb341d609c2b4515fb7e2 100644 (file)
<h3>{t}GOsa registration{/t}</h3>
-
{if $step == 0}
{t}Do you want to register GOsa and benefit from the features it brings?{/t}
<p>
- <input type='radio' name='registrationType' value='' id="registrationType_"
- {if $default == ""} checked {/if}><b><LABEL for="registrationType_">{t}I do not want to register{/t}</LABEL></b>
+ <input type='radio' name='registrationType' value='dontWant' id="registrationType_dontWant"
+ {if $default == "dontWant"} checked {/if}>
+ <b><LABEL for="registrationType_dontWant">{t}I do not want to register{/t}</LABEL></b>
<p style='padding-left:20px;'>
<!-- Add a descritive text later -->
</p>
- <!--
- <input type='radio' name='registrationType' value='annonym' id="registrationType_annonym"
- {if $default == "annonym"} checked {/if}><b><LABEL for="registrationType_annonym">{t}Annonym access{/t}</LABEL></b>
- <p style='padding-left:20px;'>
- <ul>
- <li>{t}Access to the 'Open-Channels' to easily install or remove plugins within the GOsa user interface{/t}</li>
- <li>{t}Use the inbuild bugtracker and keep track of their status on the dash-board.{/t}</li>
- </ul>
- </p>
-
- <p style='padding-left:20px;'>
- {t}What information will be transmitted to the backend and maybe stored:{/t}
- <ul>
- <li>{t}Information about the installed plugins and their version.{/t}</li>
- <li>{t}The GOsa-UUID (will be generated during the registration) and a password, to authenticate.{/t}</li>
- <li>{t}The bugs you will report and the corresponding trace. You can select what information you want to send in.{/t}</li>
- </ul>
- </p>
- -->
- <input type='radio' name='registrationType' value='registered' id="registrationType_registered"
- {if $default == "registered"} checked {/if}><b><LABEL for="registrationType_registered">{t}Register{/t}</LABEL></b>
+ <input type='radio' name='registrationType' value='registrate' id="registrationType_registrate"
+ {if $default == "registrate"} checked {/if}><b><LABEL for="registrationType_registrate">{t}Register{/t}</LABEL></b>
<p style='padding-left:20px;'>
{t}Additionally to the 'Annonomous' account you can:{/t}
<ul>
{/if}
-{if $step == 1}
-
- {if $default == ""}
- <b>{t}Selected registration type:{/t} {$default}</b>
- {elseif $default == "annonym"}
- <b>{t}Selected registration type:{/t} {$default}</b>
- {elseif $default == "registered"}
-
- <h3>{t}Account settings{/t}</h3>
- <table style='width:100%;'>
- <tr>
- <td style='width:220px;'><LABEL for="uid">{t}Login-ID{/t}{$must}</LABEL></td>
- <td>
- <input type='text' name="uid" value="{$uid}" id="uid">
- </td>
- </tr>
- <tr>
- <td style='width:220px;'><LABEL for="mailAddress">{t}Mail-address{/t}{$must}</LABEL></td>
- <td>
- <input type='text' name="mailAddress" value="{$mailAddress}" id="mailAddress">
- </td>
- </tr>
- </table>
-
- <hr>
-
- <h3>{t}Password{/t}</h3>
- <table style='width:100%;'>
- <tr>
- <td style='width:220px;'><LABEL for="password">{t}Password{/t}{$must}</LABEL></td>
- <td>
- {factory type='password' name='password' id='password'
- onkeyup="testPasswordCss(\$('password').value)"}
-
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <div style='width:200px'>
- <span id="meterEmpty" style="padding:0;margin:0;width:100%;
- background-color:#DC143C;display:block;height:7px;">
- <span id="meterFull" style="padding:0;margin:0;z-index:100;
- width:0;background-color:#006400;display:block;height:7px;"></span></span>
- </div>
- </td>
- </tr>
- <tr>
- <td style='width:220px;'><LABEL for="password_repeated">{t}Password{/t} <i>({t}repeated{/t})</i>{$must}</LABEL></td>
- <td>
- {factory type='password' name='password_repeated' id='password_repeated'}
- </td>
- </tr>
- <tr>
- <td style='width:220px;'><LABEL for="restoreQuestion">{t}Password restore question{/t}{$must}</LABEL></td>
- <td>
- <input type='text' style='width:400px' name="restoreQuestion" value="{$restoreQuestion}" id="restoreQuestion">
- </td>
- </tr>
- <tr>
- <td style='width:220px;'><LABEL for="restoreAnswer">{t}Password restore answer{/t}{$must}</LABEL></td>
- <td>
- <input type='text' name="restoreAnswer" value="{$restoreAnswer}" id="restoreAnswer">
- </td>
- </tr>
- </table>
- <hr>
-
- <h3>{t}Personal information{/t}</h3>
- <table style='width:100%;'>
- <tr>
- <td style='width:220px;'><LABEL for="surname">{t}Surname{/t}{$must}</LABEL></td>
- <td>
- <input type='text' name="surname" value="{$surname}" id="surname">
- </td>
- </tr>
- <tr>
- <td style='width:220px;'><LABEL for="givenName">{t}Given name{/t}{$must}</LABEL></td>
- <td>
- <input type='text' name="givenName" value="{$givenName}" id="givenName">
- </td>
- </tr>
- </table>
-
- <hr>
- <h3>{t}Newsletter{/t}</h3>
- <table style='width:100%;'>
- <tr>
- <td style='width:220px;'><LABEL for="newsletter">{t}Newsletter{/t}</LABEL></td>
- <td>
- <input type='checkbox' name="newsletter" value="1" {if $newsletter} checked {/if}id="newsletter">
- </td>
- </tr>
- </table>
- <hr>
- <i>({$must} {t}Required fields{/t})</i>
-
-
- {/if}
-
+{if $step == 1 && $default == "registrate"}
+ <table>
+ <tr>
+ <td><LABEL for="username">{t}Login{/t}</LABEL></td>
+ <td><input type='text' id='username' name='username' value="{$username}"></td>
+ </tr>
+ <tr>
+ <td><LABEL for="password">{t}Password{/t}</LABEL></td>
+ <td>{factory type='password' name='password' id='password' value={$password}}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><div style="color: red; font-size: small;"><i>{$error}</i></div></td>
+ </tr>
+ </table>
<hr>
<div class="plugin-actions">
- <button name='stepBack'>{msgPool type=backButton}</button>
- <button name='registerNow'>{msgPool type=okButton}</button>
+ <button name='stepBack'>{msgPool type=backButton}</button>
+ <button name='registerPage1'>{msgPool type=okButton}</button>
</div>
- <script type="text/javascript">
- focus_field('uid');
- </script>
{/if}
-{if $step == 2}
-
+{if $step == 2 && $default == "registrate"}
+ <h3>{t}Registration complete{/t}</h3>
+ <p>
+ {t}GOsa instance successfully registered{/t}
+ </p>
<hr>
<div class="plugin-actions">
- <button name='stepBack'>{msgPool type=backButton}</button>
+ <button name='registerComplete'>{msgPool type=okButton}</button>
</div>
{/if}
-{if $step == 200}
- <h3>VERIFY TEXTS!!!</h3> You have receifed a mail, bafasel, please click link and so on.
-
+{if $step == 1 && $default == "dontWant"}
+ <h3>{t}Registration complete{/t}</h3>
+ <p>
+ {t}GOsa instance will not be registered{/t}
+ </p>
+ <hr>
+ <div class="plugin-actions">
+ <button name='stepBack'>{msgPool type=backButton}</button>
+ <button name='registerComplete'>{msgPool type=okButton}</button>
+ </div>
{/if}