kallithea Changeset - 8c50b164fb58

Changeset - 8c50b164fb58

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 15 years ago 2010-08-08 01:26:23
marcin@python-works.com

Implemented basic gravatar support on admin pages only for now

4 files changed with 42 insertions and 3 deletions:

pylons_app/lib/helpers.py

pylons_app/public/css/style.css

pylons_app/templates/admin/users/user_edit.html

pylons_app/templates/admin/users/users.html

0 comments (0 inline, 0 general)

pylons_app/lib/helpers.py

➞

Show inline comments

@@ @@ -268,38 +268,56 @@ def repo_name_slug(value): @@
     slug = urlify(value)
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     return slug
 flash = _Flash()
 #===============================================================================
 # MERCURIAL FILTERS available via h.
 #===============================================================================
 from mercurial import util
 from mercurial.templatefilters import age as _age, person as _person
 age = lambda  x:_age(x)
 capitalize = lambda x: x.capitalize()
 date = lambda x: util.datestr(x)
 email = util.email
 person = lambda x: _person(x)
 hgdate = lambda  x: "%d %d" % x
 isodate = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M %1%2')
 isodatesec = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M:%S %1%2')
 localdate = lambda  x: (x[0], util.makedate()[1])
 rfc822date = lambda  x: util.datestr(x, "%a, %d %b %Y %H:%M:%S %1%2")
 rfc3339date = lambda  x: util.datestr(x, "%Y-%m-%dT%H:%M:%S%1:%2")
 time_ago = lambda x: util.datestr(_age(x), "%a, %d %b %Y %H:%M:%S %1%2")
 #===============================================================================
 # PERMS
 #===============================================================================
 from pylons_app.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll
 #===============================================================================
 # GRAVATAR URL
 #===============================================================================
 import hashlib
 import urllib
 def gravatar_url(email):
     ssl_enabled = 'https' == request.environ.get('HTTP_X_URL_SCHEME')
     default = 'identicon'
     size = 32
     baseurl_nossl = "http://www.gravatar.com/avatar/"
     baseurl_ssl = "https://secure.gravatar.com/avatar/"
     baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl
     # construct the url
     gravatar_url = baseurl + hashlib.md5(email.lower()).hexdigest() + "?"
     gravatar_url += urllib.urlencode({'d':default, 's':str(size)})
     return gravatar_url

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -1890,24 +1890,25 @@ div.form div.fields div.buttons input @@
+}
 #content div.box table th.selected input
+{
 	margin: 0;
+}
 #content div.box table td
+{
     padding: 5px;
 	background: #ffffff;
     border-bottom: 1px solid #cdcdcd;
     vertical-align:middle;
+}
 #content div.box table tr.selected td
+{
     background: #FFFFCC;
+}
 #content div.box table td.selected
+{
 	padding: 0;
     width: 3%;
     text-align: center;
@@ @@ -3433,24 +3434,33 @@ table#permissions_manage span.private_re @@
     opacity:0.6;
+}
 table#permissions_manage td.private_repo_msg{
     font-size: 0.8em;
+}
 table#permissions_manage tr#add_perm_input td{
     vertical-align:middle;
+}
 /* -----------------------------------------------------------
     GRAVATARS
 ----------------------------------------------------------- */
 .gravatar_box img{
  	float:left;
  	padding-right: 5px;
  	padding-top:3px;
+}
 /* -----------------------------------------------------------
 	jquery ui
 ----------------------------------------------------------- */
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
 .ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
 /* -----------------------------------------------------------
 	jquery ui -> icons
 ----------------------------------------------------------- */

pylons_app/templates/admin/users/user_edit.html

➞

Show inline comments

@@ @@ -20,24 +20,34 @@ @@
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('user', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="gravatar_box">
               		<img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/>
               		<p>
               		<strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/>
               		${_('Using')} ${c.user.email}
               		</p>
             	</div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="new_password">${_('New password')}:</label>
                 </div>
@@ @@ -81,21 +91,20 @@ @@
                     ${h.checkbox('active',value=True)}
                 </div>
              </div>
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="admin">${_('Admin')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
             </div>
     	</div>
     </div>
     ${h.end_form()}
 </div>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -20,34 +20,36 @@ @@
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <span>${h.link_to(u'ADD NEW USER',h.url('new_user'),class_="add_icon")}</span>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
         	<th></th>
             <th class="left">${_('username')}</th>
             <th class="left">${_('name')}</th>
             <th class="left">${_('lastname')}</th>
             <th class="left">${_('active')}</th>
             <th class="left">${_('admin')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,user in enumerate(c.users_list):
              %if user.name !='default':
                 <tr class="parity${cnt%2}">
                 	<td> <img alt="gravatar" src="${h.gravatar_url(user.email)}"> </td>
                     <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
                     <td>${user.name}</td>
                     <td>${user.lastname}</td>
                     <td>${user.active}</td>
                     <td>${user.admin}</td>
                     <td>
                         ${h.form(url('user', id=user.user_id),method='delete')}
                             ${h.submit('remove','delete',class_="delete_icon action_button")}
                         ${h.end_form()}
                     </td>
                 </tr>
              %endif

0 comments (0 inline, 0 general)