You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/06/13 20:34:45 UTC
[03/17] git commit: [#7436] ticket:599 Fix layout of emails section
[#7436] ticket:599 Fix layout of emails section
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cc69dc39
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cc69dc39
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cc69dc39
Branch: refs/heads/db/7406
Commit: cc69dc3995c8f9f3e3e89655595f1b0be6a9b88c
Parents: 5255b5b
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Jun 6 10:52:37 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jun 12 19:38:41 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/user_prefs.html | 74 +++++++++++++++-------------
1 file changed, 40 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cc69dc39/Allura/allura/templates/user_prefs.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_prefs.html b/Allura/allura/templates/user_prefs.html
index b5f7edd..e4b766d 100644
--- a/Allura/allura/templates/user_prefs.html
+++ b/Allura/allura/templates/user_prefs.html
@@ -60,42 +60,42 @@
{% for a in c.user.email_addresses %}
<input name="addr-{{loop.index0}}.ord" value="{{loop.index0}}" type="hidden"/>
{% endfor %}
- {% if c.user.email_addresses %}
- <h3 class="grid-18">Email Addresses</h3>
- <table class="grid-18">
- <tr>
- <th>Primary?</th>
- <th>Address</th>
- <th>Confirmed</th>
- <th></th>
- </tr>
- {% for a in c.user.email_addresses %}
- <tr>
- {% set obj = c.user.address_object(a) %}
- <td>{{lib.radio_button('primary_addr', None, a, c.user.preferences.email_address)}}</td>
- <td>{{a}}</td>
- {% if obj %}
- <td>
- {% if obj.confirmed %}
- yes
- {% else %}
- no (<a href="{{g.url('/auth/send_verification_link', a=a)}}">verify</a>)
- {% endif %}
- </td>
+ <hr>
+ <h3>Email Addresses</h3>
+ <table class="grid-22">
+ <tr>
+ <th>Primary?</th>
+ <th>Address</th>
+ <th>Confirmed</th>
+ <th></th>
+ </tr>
+ {% for a in c.user.email_addresses %}
+ <tr>
+ {% set obj = c.user.address_object(a) %}
+ <td>{{lib.radio_button('primary_addr', None, a, c.user.preferences.email_address)}}</td>
+ <td>{{a}}</td>
+ {% if obj %}
+ <td>
+ {% if obj.confirmed %}
+ yes
{% else %}
- <td>Unknown addr obj {{a}}</td>
+ no (<a href="{{g.url('/auth/send_verification_link', a=a)}}">verify</a>)
{% endif %}
- <td>{{lib.submit_button('Delete', 'addr-%s.delete' % loop.index0)}}</td>
- </tr>
- {% endfor %}
- </table>
- {% endif %}
- <div class="grid-18">
- {{lib.text_field('new_addr.addr', 'New Email Address')}}
- {{lib.submit_button('Claim Address', name='new_addr.claim')}}
- </div>
- <div class="grid-18">
- {{lib.submit_button('Save Changes')}}
+ </td>
+ {% else %}
+ <td>Unknown addr obj {{a}}</td>
+ {% endif %}
+ <td>{{lib.submit_button('Delete', 'addr-%s.delete' % loop.index0)}}</td>
+ </tr>
+ {% endfor %}
+ <tr>
+ <td colspan="2">{{lib.text_field('new_addr.addr', '')}}</td>
+ <td colspan="2">{{lib.submit_button('Claim New Address', name='new_addr.claim')}}</td>
+ </tr>
+ </table>
+ <div class="grid-22">
+ <p></p>
+ {{lib.submit_button('Save')}}
</div>
{{lib.csrf_token()}}
</fieldset>
@@ -149,5 +149,11 @@
padding: .2em;
font-size: 1.5em;
}
+ .pad hr {
+ margin: 15px 10px;
+ width: 860px;
+ padding: 0;
+ border: 0;
+ }
</style>
{% endblock %}