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 /trunk/etherpad/src/templates/pro/account/signin.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 'trunk/etherpad/src/templates/pro/account/signin.ejs')
-rw-r--r-- | trunk/etherpad/src/templates/pro/account/signin.ejs | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/trunk/etherpad/src/templates/pro/account/signin.ejs b/trunk/etherpad/src/templates/pro/account/signin.ejs deleted file mode 100644 index c67bea6..0000000 --- a/trunk/etherpad/src/templates/pro/account/signin.ejs +++ /dev/null @@ -1,81 +0,0 @@ -<% /* 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.includeJQuery() %> -<% helpers.includeJs("pro/signin-client.js") %> -<% helpers.includeCss("pro/account.css") %> -<% helpers.setHtmlTitle("EtherPad: Sign In") %> - -<div class="fpcontent"> - <div class="account-container"> - - <%= signinNotice() %> - - <form id="signin-form" action="<%= request.path + '?' + request.query %>" method="post"> - <div class="bb bb-signin"> - <div class="bb-top"> - <div class="bb-topleft"><!-- --></div> - <div class="bb-topright"><!-- --></div> - <div class="bb-title">Sign In to <%= siteName %> EtherPad</div> - </div> - <div class="bb-in"> - <%= errorDiv() %> - <div> - <label for="email" id="email-label">Email</label> - <input class="textin" type="text" name="email" id="email" value="<%= email - %>" /> - <%= helpers.clearFloats() %> - </div> - - <div> - <label for="password" id="password-label">Password</label> - <input class="passin" type="password" name="password" - id="password" - value="<%= password - %>" /> - <%= helpers.clearFloats() %> - </div> - - <div> - <input type="checkbox" id="rememberMe" name="rememberMe" - <%= (rememberMe ? 'checked="on"' : '') %> /> - <label for="rememberMe" id="rememberMe-label">Remember me on this - computer</label> - - <button type="submit" class="bluebutton bluebutton120" id="signInButton"> - Sign In - </button> - <%= helpers.clearFloats() %> - </div> - - </div> - </div> - </form> - - <% if (showGuestBox) { %> - <form action="/ep/account/guest-sign-in" - id="guest-signin-choice" - method="get"> - <input type="hidden" name="padId" value="<%= toHTML(localPadId) %>" /> - Guests: <button type="submit">Request Guest Access</button> - </form> - <% } %> - - <div id="bottom-text"> - <a - href="/ep/account/forgot-password">Recover lost - password</a> - </div> - - </div> -</div> - |