From: Yasin Date: Tue, 13 Aug 2013 16:09:44 +0000 (+0200) Subject: Registration post value processing in progress X-Git-Tag: myslice-0.2-1~58 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=90cfd378e8bec3397b3c0c9171d8e7cac7589700 Registration post value processing in progress --- diff --git a/portal/static/css/register.css b/portal/static/css/register.css new file mode 100644 index 00000000..84610b2b --- /dev/null +++ b/portal/static/css/register.css @@ -0,0 +1,92 @@ +#commentForm { + + margin:0 auto; + width:800px; + padding:10px; + font-size:12pt; + overflow:auto; + } +input { + border:2px solid #456879; + height: 22px; + width: 200px; + font-size: 10px; + } +label { + float: left; + font-weight: bold; + text-align: right; + margin-right: 20px; + width: 200px; + display: inline-block; + +} + +.fed4fireTitle{ + padding-top: 12px; + background-color: orange; + border: 1px solid #61210B; + text-align: center; +} + +label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-size: 12px; } + +p { +/*border-bottom:1px solid #B7DDF2;*/ +color:#666666; +font-size:10px; +margin-bottom:20px; +padding-bottom:10px; +} + + + +legend { + position: relative; + top: -2px; + background: cornsilk; + padding: 10px 100px; + border: 2px groove threedface; + border-top: none; + box-shadow: inset 0 -5px 5px rgba(0,0,0,.2); + text-shadow: 1px 1px 2px rgba(0,0,0,.3); + font-weight: bold; + font-size: 25px; + margin-left: 90px; +} + +textarea:focus, input:focus { + border: 2px solid #900; +} + +.required{ +font-size:12pt; +} +.submit { +/* float:right; */ +text-align: center; +margin-top: 15px; +margin-left: 180px; +} +.field { +padding:10px; +} +.hint{ + display:none; + } +.field:hover .hint { + position: absolute; + display: block; + margin: -30px 0 0 455px; + color: #FFFFFF; + padding: 7px 10px; + background: rgba(0, 0, 0, 0.6); + + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + } + + + + diff --git a/portal/static/my_account.common.css b/portal/static/my_account.common.css deleted file mode 100644 index 82540a63..00000000 --- a/portal/static/my_account.common.css +++ /dev/null @@ -1,230 +0,0 @@ -/***************************************************************** - - common.css - - - January 18, 2009 - - - March 7, 2009 - - - shawiz@cs.washington.edu - Xuanhua (Sean) Ren - - - Provides the common stylesheet for Seattle Clearinghouse - - -*****************************************************************/ - - -/******************* -* RESET -********************/ - -* { - margin: 0; - padding: 0; -} - -fieldset, img { - border: 0; -} - - - -/************************ -* GENERAL -************************/ - -body { - background-color: #fff; - font-family: "Segoe UI", "Lucida Grande", "Helvetica" , sans-serif; - font-size: 12pt; - min-width: 1000px; /* ADDED July 2012 */ - margin: 0px auto; /* ADDED Aug 14, 2012 */ -} - -ol { - list-style-position: inside; -} - -a { - text-decoration: none; - color: #0066FF; -} - -code { - font-family: "Consolas", "Lucida Console", "Monaco", "Courier New"; -} - -.odd { - background-color: #fff; -} - -.even { - background-color: #eee; -} - - -/************************ -* LAYOUT -************************/ - -/***** Header *****/ - -#header { - width: 900px; /* Edited Aug 14, 2012 prev width:70%*/ - margin: 30px auto 20px auto; -} - -#header #logo { - font-size: 42px; /* Edited Sept 28, 2012 prev value :36pt*/ - font-weight: bold; -} - -#header #logo a { - color: #000; -} - -#header #caption { - margin-left: 20px; - font-size: 13.3333px; -} - -#header #caption a { - color: #0066FF; -} - - -/***** Navigator *****/ - -#navigator { - border-bottom: 3px solid #222; - width: 100%; - margin: 0 auto; /* ADDED Aug 14, 2012 */ -} - -#tabs { - margin: 0 auto; - width: 900px; /* Editied Aug 14, 2012 prev width: 70% */ -} - -#meta { - float: right; - font-size: 13pt; - margin: 5px 0; -} - -#meta a.logout { - color: red; -} - -#tabs table { - border-collapse: collapse; - border-spacing: 0; -} - -#tabs table tr td { - padding: 5px 15px; - font-size: 14pt; - border-top: 1px solid #222; - border-right: 2px solid #222; - border-left: 2px solid #222; -} - -#tabs table tr td a { - color: #000; -} - -#tabs table tr td.active { - background-color: #222; - color: #fff; -} - -#tabs table tr td.active a { - color: #fff; -} - - -/***** Main *****/ - -#main { - width: 100%; - height: 400px; - padding: 40px 0; - background-image: url(../images/bg.png); - background-repeat: repeat-x; -} - -#middle { - margin: 0 auto; - width: 900px; /* Edited Aug 14, 2012 prev width:70% */ - padding-bottom: 60px; -} - - -/***** Notifications *****/ - -.warning { - border: 1px solid red; - margin: 20px 60px; - padding: 10px 20px; - color: red; - background-color: #f2dbdb; - text-align: center; -} -.warning2 { - border: 1px solid red; - margin: 20px 60px; - padding: 10px 20px; - color: red; - background-color: #f2dbdb; - text-align: center; -} -.message { - border: 1px solid green; - max-width : 682px; /* ADDED July 2012 */ - margin: 20px 60px; - padding: 10px 20px; - color: green; - font-weight: bold; - background-color: #CCFFCC; - text-align: center; -} - -.tooltip { - background-color: #efefef; - color: #333; - font-size: 10pt; - padding: 3px; - border: solid 1px #333; - z-index:100; -} - -ul.errorlist li { - color: red; - font-weight: normal; - font-size: 10pt; - background-color: #f2dbdb; - padding: 3px; - list-style-position: inside; -} - -#learn-about-seattle { - /* max-width : 70%;*/ - text-align : center; - background-color : #ded; - border : 1px solid #0a0; - padding : 1em; - margin-top : 1em; - margin-bottom : 1em; - font-size : 1.3em; -} - - - - - - diff --git a/portal/static/my_account.profile.css b/portal/static/my_account.profile.css deleted file mode 100644 index b6e1b208..00000000 --- a/portal/static/my_account.profile.css +++ /dev/null @@ -1,173 +0,0 @@ - - -/****************************** -* STYLE FOR PROFILE PAGE -*******************************/ - -h1 { - font-size: 1.8em; - border-bottom: 1px solid #bbb; - width: 70%; - min-width: 688px; -} - -#info { - background-color : #ded; - border : 1px solid #0a0; - padding : 1em; - margin-bottom : 1em; -} - -#error_msg { - background-color : #f2dbdb; - border : 1px solid red; - padding : 1em; - margin-bottom : 1em; -} - -ul.errorlist li { - font-size: 12pt; - padding: 0px; -} - -/* ADDED July 27, 2012 to fix the table collapsing on itself when the browser is below a certain size */ -table.profile { - border-collapse: collapse; - border-spacing: 0; - width: 70%; - min-width: 703px; -} - -table.profile tr td.key { - text-align: right; - height: 30px; - font-size: 16px; - font-weight: bold; - width: 160px; -} - -table.profile tr td.value { - padding-left: 20px; - min-width: 500px; /* ADDED July 27, 2012 */ -} - -table.profile button { - width: 80px; - vertical-align: middle; - float: right; - margin-right: 15px; -} - -table.profile span.hide_this{ - display: inline; - display: none; -} - -table.profile form{ - display:inline; -} - -#download { - float: right; - border: 2px solid #666; - background-color: #fff; - padding: 10px; - margin-right: 0px; - text-align: center; - font-weight: bold; -} - -#download a img { - display: block; - width: 150px; -} - -#download a { - color: black; -} - -#download_pubkey_form { - display : inline; -} -/* ADDED(everything below) Aug 14, 2012 */ -#generate_api { - width: 175px; -} - -#change_key form { - display: inline; - width: 688px; -} - -#generate_keypair { - position:relative; - width: 175px; - float: right; - margin-right: 15px; - -} -#edit_password table { - display:inline; - margin: auto; - border-collapse: collapse; - border-spacing: 0; - padding-left: 5px; - width: 100%; -} - -#edit_password td.field { - padding-left: 5px; - -} - -.wide_button { - width: 175px; -} - -.api_cell { - color:red; -} - -.api_cell:hover { - text-decoration: underline; -} - -img.help { - position: relative; - float: left; - left: 162px; - display: none; - /* when a negative margin is applied to right or bottom - it allows the element to overlap - */ - margin-bottom: -50px; -} - -#id_email { - width: 200px; -} - -#aff_list { - width: 200px; -} -#name { - width: 200px; -} - -/*Added Sept 2012 to fix long api keys creating a new line*/ -#api_key { - color: red; - font-family: courier; -} - -#up_arrow { - height: 36px; - width: 36px; - float: right; - position: relative; - margin-right: 132px; - /*when a negative margin is applied to right or bottom - it allows the element to overlap - */ - margin-bottom:-50px; -} diff --git a/portal/static/ques_icon.png b/portal/static/ques_icon.png deleted file mode 100644 index 4113c121..00000000 Binary files a/portal/static/ques_icon.png and /dev/null differ diff --git a/portal/templates/register_4m_f4f.html b/portal/templates/register_4m_f4f.html index 131fdd4f..d23654dc 100644 --- a/portal/templates/register_4m_f4f.html +++ b/portal/templates/register_4m_f4f.html @@ -15,7 +15,7 @@ -
+ {% csrf_token %}
@@ -55,7 +55,7 @@
- +

Retype the password

diff --git a/portal/urls.py b/portal/urls.py index dd797a20..20bddfd8 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -46,6 +46,7 @@ urlpatterns = patterns('', url(r'^account/?$', views.my_account), url(r'^acc_process/?$', views.acc_process), url(r'^register/?$', views.register_4m_f4f), + url(r'^reg_process/?$', views.reg_4m_f4f_process), url(r'^contact/?$', views.contact), # Slice request url(r'^slice_request/?$', views.slice_request), diff --git a/portal/views.py b/portal/views.py index 2dc53247..23703d8c 100644 --- a/portal/views.py +++ b/portal/views.py @@ -488,7 +488,7 @@ def acc_process(request): #approach borrowed from register view #new_user = PendingUser.objects.create_inactive_user(edited_first_name, edited_last_name, email, password, site) #conventional approach - #b = PendingUser(first_name=edited_first_name, edited_last_name=last_name) + #b = PendingUser(first_name=edited_first_name, last_name=edited_last_name) #b.save() # select and update [will be used throughout this view] @@ -564,6 +564,12 @@ def acc_process(request): def register_4m_f4f(request): return render(request, 'register_4m_f4f.html') +def reg_4m_f4f_process(request): + if 'submit' in request.POST: + return HttpResponse('Registration Successful. Please wait for account validation') + + + # view for contact form def contact(request): if request.method == 'POST': # If the form has been submitted...