Merged My Account css, changed the html name to account-view.html

diff --git a/portal/accountview.py b/portal/accountview.py
index e57dfed..a95a7a4 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -12,7 +12,7 @@ import json
 
 # requires login
 class AccountView(LoginRequiredAutoLogoutView):
 
 # requires login
 class AccountView(LoginRequiredAutoLogoutView):

-    template_name = "my_account.html"
+    template_name = "account-view.html"

     
     def dispatch(self, *args, **kwargs):
         return super(AccountView, self).dispatch(*args, **kwargs)
     
     def dispatch(self, *args, **kwargs):
         return super(AccountView, self).dispatch(*args, **kwargs)

diff --git a/portal/static/css/my_account.common.css b/portal/static/css/account_view_html.css
similarity index 61%
rename from portal/static/css/my_account.common.css
rename to portal/static/css/account_view_html.css
index 7c59bd8..0b1b6bb 100644 (file)
--- a/portal/static/css/my_account.common.css
+++ b/portal/static/css/account_view_html.css
@@ -1,26 +1,5 @@
 /*****************************************************************
 /*****************************************************************

-<File Name>
-       common.css
-
-<Started>
-       January 18, 2009
-       
-<Refactored>
-    March 7, 2009
-
-<Author>
-       shawiz@cs.washington.edu
-       Xuanhua (Sean) Ren
-
-<Purpose>
-       Provides the common stylesheet for Seattle Clearinghouse
-
-
-*****************************************************************/
-
-
-/*******************
-* RESET
+Motivated from Geni clearing house

 ********************/
 
 * {
 ********************/
 
 * {


@@ -241,3 +220,176 @@ background: #f1f8ee; font: .9em/1.2em Georgia, "Times New Roman", Times, serif;
 .mytable th a, td a:active { color: #fff; }
 .mytable tfoot th, tfoot td { background: #2C5755; color: #fff; }
 .mytable th + td { padding-left: .5em; }
 .mytable th a, td a:active { color: #fff; }
 .mytable tfoot th, tfoot td { background: #2C5755; color: #fff; }
 .mytable th + td { padding-left: .5em; }

+
+
+/******************************
+* STYLE FOR PERSONAL DETAILS TABLE
+*******************************/
+
+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/css/my_account.profile.css b/portal/static/css/my_account.profile.css
deleted file mode 100644 (file)
index b6e1b20..0000000
--- a/portal/static/css/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/templates/my_account.html b/portal/templates/account-view.html
similarity index 96%
rename from portal/templates/my_account.html
rename to portal/templates/account-view.html
index 75cb11f..e8edc60 100644 (file)
--- a/portal/templates/my_account.html
+++ b/portal/templates/account-view.html
@@ -1,9 +1,7 @@
 {% extends "layout-unfold1.html" %}
 
 {% block head %}
 {% extends "layout-unfold1.html" %}
 
 {% block head %}

-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/my_account.common.css" />
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/my_account.profile.css" />
-<!-- <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/dashboard.css" /> !-->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/account_view_html.css" />

 <script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script> 
 <script type="text/javascript" src="{{STATIC_URL}}/my_account.edit_profile.js"></script>
 <script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>
 <script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script> 
 <script type="text/javascript" src="{{STATIC_URL}}/my_account.edit_profile.js"></script>
 <script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>