diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
tree | 1d19df6405103577d872902486792e8c23bce711 /etherpad/src/themes/default/templates/pro-account/sign-in.ejs | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'etherpad/src/themes/default/templates/pro-account/sign-in.ejs')
-rw-r--r-- | etherpad/src/themes/default/templates/pro-account/sign-in.ejs | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/etherpad/src/themes/default/templates/pro-account/sign-in.ejs b/etherpad/src/themes/default/templates/pro-account/sign-in.ejs new file mode 100644 index 0000000..470bbc4 --- /dev/null +++ b/etherpad/src/themes/default/templates/pro-account/sign-in.ejs @@ -0,0 +1,57 @@ +<% /* Copyright 2009 Google Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS-IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. */ %><% helpers.includeCss("global-pro-account.css") %> + +<div class="fpcontent"> + <div class="global-pro-account"> + + <h1>EtherPad Professional Sign In</h1> + + <%= errorDiv() %> + + <form id="global-sign-in" + action="<%= request.path %>" method="post"> + <label for="email">Email Address:</label> + <input type="text" name="email" id="email" size="30" + <% if (oldData.email) { %>value="<%= oldData.email %>"<% } %> + /> + + <label for="password">Password:</label> + <input type="password" name="password" id="password" size="30" /> + + <label for="subDomain">Site Address:</label> + <input type="text" name="subDomain" id="subDomain" size="30" + <% if (oldData.subDomain) { %>value="<%= oldData.subDomain %>"<% } %> + />.<%= request.host %>/ + <br/> + <button type="submit">Sign In</button> + + <div class="tip"> + <b>Tip:</b> you can also sign in by going directly to your site + address. + </div> + + </form> + + <p><a href="/ep/pro-account/recover">Recover lost password or + site address</a></p> + + <hr/> + + <p>New users: <a href="/ep/pro-signup/">create an account + instantly</a>.</p> + + </div> +</div> + + |