Permalink
Browse files

Mixed tabs and spaces + cloud mining logo link

  • Loading branch information...
1 parent 2248719 commit a9aac5c3c7e70540b94a333ff6ec205ae160a418 @alexksikes committed Dec 21, 2011
Showing with 62 additions and 62 deletions.
  1. +47 −47 app/views/applicant.html
  2. +13 −13 app/views/applicants.html
  3. +1 −1 app/views/layout.html
  4. +1 −1 public/css/defaults.css
View
@@ -76,28 +76,28 @@
<div class="applicant">
$ name = applicant.first_name + ' ' + applicant.last_name
<input type="hidden" name="id" value="$applicant.id">
-
- <h1>$name, $applicant.occupation</h1>
- <h2>$applicant.department, $applicant.affiliation</h2>
+
+ <h1>$name, $applicant.occupation</h1>
+ <h2>$applicant.department, $applicant.affiliation</h2>
$if applicant.affiliated:
- <div class="affiliated">Affiliated to the university (no reference needed, no travel/accomodation support and charged a smaller fee).</div>
-
- <div class="applicant_score">
- $if applicant.calculated_vote:
- $:show_stars(applicant.calculated_vote) ($applicant.calculated_vote / 5) -
- <strong>
- $if applicant.status == 'admitted':
- <img src="/img/accept.png"/> Admitted
- $elif applicant.status == 'rejected':
- <img src="/img/delete.png"/> Rejected
- $else:
- <img src="/img/error.png"/> Undecided
- </strong>
- $if applicant.decided_by_user_id:
+ <div class="affiliated">Affiliated to the university (no reference needed, no travel/accomodation support and charged a smaller fee).</div>
+
+ <div class="applicant_score">
+ $if applicant.calculated_vote:
+ $:show_stars(applicant.calculated_vote) ($applicant.calculated_vote / 5) -
+ <strong>
+ $if applicant.status == 'admitted':
+ <img src="/img/accept.png"/> Admitted
+ $elif applicant.status == 'rejected':
+ <img src="/img/delete.png"/> Rejected
+ $else:
+ <img src="/img/error.png"/> Undecided
+ </strong>
+ $if applicant.decided_by_user_id:
by $applicant.nickname
</div>
-
+
$if votes:
<div class="applicant_score_details">
Rated $applicant.calculated_vote_counts times by
@@ -111,19 +111,19 @@
<img src="/img/money.png"/> Allocated \$$applicant.grant_amount of financial support.
</div>
- <div class="simple_box">
- <a href="/resumes/$applicant.resume_fn"><strong>Download resume</strong></a> uploaded $how_long(applicant.creation_ts) - highest degree received is <strong>$applicant.degree</strong>.
+ <div class="simple_box">
+ <a href="/resumes/$applicant.resume_fn"><strong>Download resume</strong></a> uploaded $how_long(applicant.creation_ts) - highest degree received is <strong>$applicant.degree</strong>.
</div>
-
- <div class="simple_box">
- Contact info:
+
+ <div class="simple_box">
+ Contact info:
$if applicant.website:
<a class="website" href='$applicant.website'>website</a> /
<a href="mailto:$applicant.email">$applicant.email</a> / $:google_link(name) / $:google_link(name, 'scholar') / $:cloud_link(name)
</div>
-
- <div class="simple_box">
- Interested in:
+
+ <div class="simple_box">
+ Interested in:
$for i in split('[,;:]+', applicant.interests):
<a class='animated' href="/search?query=$url_quote(i)">$i</a>&nbsp;
</div>
@@ -135,7 +135,7 @@
</div>
$if applicant.travel_support:
- <div class="simple_box" id='travel_support'>
+ <div class="simple_box" id='travel_support'>
Financial support: This applicant needs \$$applicant.travel_support_budget.
$if applicant.grant_amount:
Received <strong>\$$applicant.grant_amount</strong>.
@@ -149,22 +149,22 @@
$if not applicant.affiliated or applicant.referee_email:
<div class="box">
- <div class="box_title">Referred by <strong>$applicant.referee_name</strong>, $applicant.referee_affiliation
- $if applicant.update_ts:
- on
- $how_long(applicant.update_ts)
- </div>
+ <div class="box_title">Referred by <strong>$applicant.referee_name</strong>, $applicant.referee_affiliation
+ $if applicant.update_ts:
+ on
+ $how_long(applicant.update_ts)
+ </div>
<div class="sub_title">
<a href="mailto:$applicant.referee_email">contact referee</a> /
$:google_link(applicant.referee_name) / $:google_link(applicant.referee_name, 'scholar') / $:cloud_link(applicant.referee_name)
- </div>
+ </div>
<div class="box_content">
- $if applicant.referee_rating:
- <div class="referee_score">$:show_stars(applicant.referee_rating, 'green')</div>
- $:text2html(applicant.reference)
- $else:
- Waiting for the referee to send the letter. (<strong>pending</strong>)
+ $if applicant.referee_rating:
+ <div class="referee_score">$:show_stars(applicant.referee_rating, 'green')</div>
+ $:text2html(applicant.reference)
+ $else:
+ Waiting for the referee to send the letter. (<strong>pending</strong>)
$if not applicant.referee_rating:
<p>The secret url to submit the reference for $name is:
@@ -175,8 +175,8 @@
</strong>
</p>
- </div>
- </div>
+ </div>
+ </div>
$if applicant.poster_title:
<div class="box">
@@ -207,22 +207,22 @@
style="display:none;"
>Add a comment</a>
- <div id="add_comment"
+ <div id="add_comment"
$if comments:
style="display:none;"
$else:
style="display:block;"
>
- <div class="box_title">Add a comment:</div>
- <textarea id="comment" name="comment"></textarea>
- <input type="button" value="Add comment"
- onClick="document.theform.action = '/applicant/$applicant.id/comment'; document.theform.submit();"/>
- </div>
+ <div class="box_title">Add a comment:</div>
+ <textarea id="comment" name="comment"></textarea>
+ <input type="button" value="Add comment"
+ onClick="document.theform.action = '/applicant/$applicant.id/comment'; document.theform.submit();"/>
+ </div>
$for c in comments:
<div class="box">
<div class="box_title">
- <strong>$c.nickname</strong>, $how_long(c.creation_ts)
+ <strong>$c.nickname</strong>, $how_long(c.creation_ts)
$if user.is_logged and user.id == c.user_id:
(<a href="/delete_comment/$c.id">delete</a>)
</div>
View
@@ -19,7 +19,7 @@
$def show_table_header():
<tr>
<th class="checkbox"></th>
- $for order_name, order_by in [('ID', 'id'), ('Applicant Name', 'first_name'), ('Occupation', 'occupation'), ('Affiliation', 'affiliation'), ('Interests', 'interests'), ('FS ($)', 'travel_support_budget'), ('FSA ($)', 'grant_amount'), ('Referee Rating', 'referee_rating'), ('Comments', 'number_comments'), ('Overall Rating', 'calculated_vote'), ('Status', 'status')]:
+ $for order_name, order_by in [('ID', 'id'), ('Applicant Name', 'first_name'), ('Occupation', 'occupation'), ('Affiliation', 'affiliation'), ('Interests', 'interests'), ('FS ($)', 'travel_support_budget'), ('FSA ($)', 'grant_amount'), ('Referee Rating', 'referee_rating'), ('Comments', 'number_comments'), ('Overall Rating', 'calculated_vote'), ('Status', 'status')]:
$ new_desc = dict(desc='asc', asc='desc')[inputs.desc]
$if order_by == inputs.order:
<th id="$order_by"><a class="selected" href="/$context?$url_encode(inputs, start=0, desc=new_desc)">$order_name
@@ -106,7 +106,7 @@
>
<td class="checkbox"><input name="id" type="checkbox" value="$r.id" onclick="highlight_row(this)"></td>
<td>$r.id</td>
- <td>
+ <td>
$ name = r.first_name + ' ' + r.last_name
<a href="/applicant/$r.id?$url_encode(inputs, context=context, start=pager.start)">$:cut_length(name, 20, tooltip=True)</a>
$if r.website:
@@ -141,26 +141,26 @@
<a title="Referred by $r.referee_name">$:show_stars(r.referee_rating, color='green')</a>
<td class="score_column">
- $if r.commenters:
- <a title="Commented by $r.commenters"><img src="/img/comments.png"/> ($r.number_comments)</a>
- $else:
- -
- </td>
+ $if r.commenters:
+ <a title="Commented by $r.commenters"><img src="/img/comments.png"/> ($r.number_comments)</a>
+ $else:
+ -
+ </td>
<td class="score_column">
- $if r.calculated_vote:
- <a title="$r.calculated_vote / 5: rated by $r.voters">$:show_stars(r.calculated_vote) (out of $r.number_votes)</a>
- $else:
- -
- </td>
+ $if r.calculated_vote:
+ <a title="$r.calculated_vote / 5: rated by $r.voters">$:show_stars(r.calculated_vote) (out of $r.number_votes)</a>
+ $else:
+ -
+ </td>
<td class="score_column">
$if r.status == 'admitted':
<a title="Admitted by $r.decided_by_nickname"><img src="/img/bullet_add.png"/></a>
$elif r.status == 'rejected':
<a title="Rejected by $r.decided_by_nickname"><img src="/img/bullet_delete.png"/></a>
$else:
-
- </td>
+ </td>
$#<td class="update_time">$how_long(r.creation_ts)</td>
</tr>
View
@@ -13,7 +13,7 @@
<a href="/$_context" id="$_context">$name $:show_counts(_context)</a>
$if _context == 'new' and counts['new']:
</strong>
-
+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
View
@@ -391,7 +391,7 @@ div.referee_score, div.applicant_score, div.applicant_score_details {
}
a.cloud_link {
- background: url(/img/weather_cloudy.png) no-repeat right;
+ background: url(/img/cloud_logo.png) no-repeat right;
padding-right: 18px;
}
/* end of single result */

0 comments on commit a9aac5c

Please sign in to comment.