Skip to content

Commit 4bbcdbe

Browse files
committed
A handful of cleanups
1 parent e7b35b5 commit 4bbcdbe

File tree

6 files changed

+61
-16
lines changed

6 files changed

+61
-16
lines changed

app/controllers/crate/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ export default Ember.ObjectController.extend({
2828
return this.get("sortedVersions.length") > NUM_VERSIONS;
2929
}.property('sortedVersions'),
3030

31+
anyLinks: function() {
32+
return this.get('homepage') ||
33+
this.get('wiki') ||
34+
this.get('mailing_list') ||
35+
this.get('documentation') ||
36+
this.get('repository');
37+
}.property('homepage', 'wiki', 'mailing_list', 'documentation', 'repository'),
38+
3139
displayedAuthors: function() {
3240
var self = this;
3341
if (!this.get('currentVersion')) {

app/helpers/format-email.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import Ember from "ember";
2+
3+
var escape = Ember.Handlebars.Utils.escapeExpression;
4+
5+
function formatEmail(email) {
6+
var formatted = email.match(/^(.*?)\s*(?:<(.*)>)?$/);
7+
var email = "";
8+
9+
email += escape(formatted[1]);
10+
11+
if (formatted[2]) {
12+
email = "<a href='mailto:" + escape(formatted[2]) + "'>" + email + "</a>";
13+
}
14+
15+
console.log(email);
16+
return email.htmlSafe();
17+
}
18+
19+
export default Ember.Handlebars.makeBoundHelper(formatEmail);

app/helpers/format-req.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import Ember from "ember";
2+
3+
function formatReq(req) {
4+
return req === "*" ? "" : req;
5+
}
6+
7+
export default Ember.Handlebars.makeBoundHelper(formatReq);

app/styles/crate.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@
152152
.top, .bottom {
153153
@include flex-direction(column);
154154
}
155+
156+
ul {
157+
padding-left: 20px;
158+
}
155159
}
156160
}
157161

app/templates/crate/index.hbs

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</div>
4949
{{/if}}
5050
<div class='install'>
51-
<div class='action'>Depend</div>
51+
<div class='action'>Cargo.toml</div>
5252
<code>{{ name }} = "~{{ currentVersion.num }}"</code>
5353
</div>
5454
</div>
@@ -59,11 +59,11 @@
5959
<div class='date'>{{ from-now updated_at }}</div>
6060
</div>
6161

62-
<div>
62+
<div class="authors">
6363
<h3>Authors</h3>
6464
<ul>
6565
{{#each displayedAuthors}}
66-
<li>{{ name }}</li>
66+
<li>{{ format-email name }}</li>
6767
{{/each}}
6868
</ul>
6969
</div>
@@ -107,6 +107,7 @@
107107
</div>
108108

109109
<div id='crate-links'>
110+
{{#if anyLinks}}
110111
<div class='section'>
111112
<h3>Links</h3>
112113
<ul>
@@ -127,32 +128,37 @@
127128
{{/if}}
128129
</ul>
129130
</div>
131+
{{/if}}
130132

131133
<div class='section' id='crate-dependencies'>
132134
<h3>Dependencies</h3>
133135
<ul>
134136
{{#each currentDependencies}}
135137
<li>
136138
{{#link-to 'crate' crate_id}}
137-
{{ crate_id}} {{ req }}
139+
{{ crate_id }} {{ format-req req }}
138140
{{/link-to}}
139141
</li>
142+
{{else}}
143+
<li>None</li>
140144
{{/each}}
141145
</ul>
142146
</div>
143147

144-
<div class='section' id='crate-dev-dependencies'>
145-
<h3>Dev-Dependencies</h3>
146-
<ul>
147-
{{#each currentDevDependencies}}
148-
<li>
149-
{{#link-to 'crate' crate_id}}
150-
{{ crate_id}} {{ req }}
151-
{{/link-to}}
152-
</li>
153-
{{/each}}
154-
</ul>
155-
</div>
148+
{{#if currentDevDependencies}}
149+
<div class='section' id='crate-dev-dependencies'>
150+
<h3>Dev-Dependencies</h3>
151+
<ul>
152+
{{#each currentDevDependencies}}
153+
<li>
154+
{{#link-to 'crate' crate_id}}
155+
{{ crate_id}} {{ req }}
156+
{{/link-to}}
157+
</li>
158+
{{/each}}
159+
</ul>
160+
</div>
161+
{{/if}}
156162

157163
<div class='section' id='crate-versions'>
158164
<h3>Versions</h3>

app/templates/loading.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Loading...

0 commit comments

Comments
 (0)