Skip to content

Commit

Permalink
too much emphasis
Browse files Browse the repository at this point in the history
  • Loading branch information
tristen committed Apr 30, 2013
1 parent 8344901 commit 2bfa8bb
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 111 deletions.
145 changes: 48 additions & 97 deletions img/sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/prose/views/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ module.exports = Backbone.View.extend({
},

deleteFile: function() {
if (confirm('Are you sure you want to delete that file?')) {
if (confirm('Are you sure you want to delete this file?')) {
window.app.models.deletePost(app.state.user, app.state.repo, app.state.branch, this.model.path, this.model.file, _.bind(function (err) {
if (err) return alert('Error during deletion. Please wait 30 seconds and try again.');
router.navigate([app.state.user, app.state.repo, 'tree', app.state.branch].join('/'), true);
Expand Down
2 changes: 1 addition & 1 deletion src/prose/views/posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ module.exports = Backbone.View.extend({
fileName: $file.data('file')
};

if (confirm('Are you sure you want to delete that file?')) {
if (confirm('Are you sure you want to delete this file?')) {
window.app.models.deletePost(file.user, file.repo, file.branch, this.model.currentPath, file.fileName, _.bind(function (err) {
if (err) return alert('Error during deletion. Please wait 30 seconds and try again.');
router.navigate([file.user, file.repo, 'tree', file.branch].join('/'), true);
Expand Down
16 changes: 4 additions & 12 deletions templates/projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,13 @@
data-index='<%= index %>'>

<% if (app.state.user === app.username && (owner.login !== app.username && private)) { %>
<div class='fl icon round repo owner private popup-hover'>
<span class='popup round arrow-left'>Shared with <%= owner.login %></span>
</div>
<div class='fl icon round repo owner private' title='Shared from the account (<%= owner.login %>)'></div>
<% } else if (app.state.user === app.username && owner.login !== app.username) { %>
<div class='fl icon round repo owner popup-hover'>
<span class='popup round arrow-left'>Shared with <%= owner.login %></span>
</div>
<div class='fl icon round repo owner' title='Shared from the account (<%= owner.login %>)'></div>
<% } else if (fork && private) { %>
<div class='fl icon round repo private fork popup-hover'>
<span class='popup round arrow-left'>Forked Project</span>
</div>
<div class='fl icon round repo private fork' title='Forked from another project'></div>
<% } else if (fork) { %>
<div class='fl icon round repo fork popup-hover'>
<span class='popup round arrow-left'>Forked Project</span>
</div>
<div class='fl icon round repo fork' title='Forked from another project'></div>
<% } else if (private) { %>
<div class='fl icon round repo private'></div>
<% } else { %>
Expand Down

0 comments on commit 2bfa8bb

Please sign in to comment.