Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git@activereload.net:warehouse

  • Loading branch information...
commit 8dbb6cb65d54091e5974ab0b1dcb8cccea26a062 2 parents c25c4fa + 0cc5d26
@technoweenie technoweenie authored
View
3  app/views/changesets/index.html.erb
@@ -34,7 +34,7 @@
</div>
<div class="cs-log clearfix">
<%= simple_format(h(changeset.message)) %>
- <span class="timenauthor">by <%= changeset.author %>, <%= jstime changeset.changed_at %></span>
+ <span class="timenauthor">by <%= changeset.author %>, <%= jstime changeset.changed_at %> in <%= link_to(h(changeset.repository.name), hosted_url(changeset.repository, :changesets)) %></span>
</div>
</li>
<% end -%>
@@ -66,6 +66,7 @@
<% end %>
</ul>
</div>
+
<% elsif repository_subdomain.blank? -%>
<div class="sideblock">
<h3><%= 'Public ' if controller.action_name == 'public' %>Repository Activity</h3>
View
9 app/views/layouts/application.html.erb
@@ -154,14 +154,7 @@
<% end -%>
</div>
<!-- /content -->
- <!-- footer -->
- <div id="footer">
- <!-- <form action="/" method="post" id="command-line">
- <input id="commando" type="text" />
- </form> -->
- <a id="powered" href="http://warehouseapp.com" title="Warehouse v<%= Warehouse.version %>: web-based subversion browser"><img src="/images/app/warehouse-logo.png" title="Warehouse v<%= Warehouse.version %>: web-based Subversion Browser" alt="Warehouse logo" /></a>
- </div>
- <!-- /footer -->
+
</div>
<!-- /container -->
View
4 app/views/repositories/index.html.erb
@@ -21,9 +21,10 @@
<%= link_to h(repo.name), hosted_url(repo, :admin) %>
<span class="log"><%= repo.path %></span>
<% if repo.sync? %>
+ <% unless repo.sync_progress == 100 %>
+
<div class="need-sync" id="sync-<%= repo.id %>">
<span id="percent-<%= repo.id %>" class="sync-percent"><%= repo.sync_progress %>%</span>
-
The changeset(s)
<%= repo.revisions_to_sync.first %><%= "-#{repo.revisions_to_sync.last}" if repo.revisions_to_sync.first != repo.revisions_to_sync.last %>
need to be synced.
@@ -41,6 +42,7 @@
});
<% end -%>
</div>
+ <% end %>
<% end -%>
<ul class="admin-controls">
<% if repo.sync? %>
View
2  db/schema.rb
@@ -113,7 +113,7 @@
t.string "scm_type", :default => "svn"
t.datetime "synced_changed_at"
t.string "synced_revision"
- t.integer "changesets_count"
+ t.integer "changesets_count", :default => 0
end
add_index "repositories", ["subdomain"], :name => "index_repositories_on_subdomain"
View
43 public/stylesheets/main.css
@@ -15,7 +15,7 @@ body {
margin: 0;
text-align: center;
padding: 0;
- font: normal 12px/1.5em "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
+ font: normal 12px/1.5em "Helvetica Neue", Helvetica, "Lucida Grande", "Helvetica Neue", Arial, sans-serif;
background: #ebebeb;
color: #333;
min-width: 900px;
@@ -270,7 +270,7 @@ li#admin a {
.block h3 a {
color: #333;
- text-shadow: 2px 2px #f7f7f7;
+ text-shadow: 1px 1px #f7f7f7;
}
/* @end */
@@ -307,7 +307,7 @@ li#admin a {
background: url(../images/app/icons/box-small.png) 0 50% no-repeat;
padding: 8px 5px 8px 20px;
color: #333;
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
display: block;
border-bottom: 1px solid #ccc;
border-top: 1px solid #fff;
@@ -576,7 +576,7 @@ div#crumbs ul {
}
#crumbs li a {
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
background: url(../images/app/crumb-divide.gif) top right no-repeat;
display: block;
color: #555;
@@ -597,7 +597,7 @@ li.crumb-divide-last a {
color: #fff;
font-size: 92%;
float: left;
- text-shadow: 2px 2px #777;
+ text-shadow: 1px 1px #777;
background: url(../images/app/crumb-current.gif) repeat-x;
padding: 4px 10px 7px 10px;
border-right: 1px solid #999;
@@ -665,7 +665,7 @@ div p.rcontrols {
.cs-meta .change-number a {
color: #481;
- text-shadow: 2px 2px #f7f7f7;
+ text-shadow: 1px 1px #f7f7f7;
float: none;
padding-right: 0;
margin-top: 3px;
@@ -718,7 +718,7 @@ li.prev a {
border-bottom-color: #ccc;
border-right-color: #ccc;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 120%;
+ font-size: 110%;
font-weight: bold;
}
@@ -740,7 +740,6 @@ li.prev a {
.changeset .timenauthor {
color: #888;
font-weight: normal;
- font-size: 92%;
display: block;
}
@@ -845,7 +844,7 @@ a.csdiff {
font-size: 92%;
font-weight: bold;
color: #333;
- text-shadow: 2px 2px #eee;
+ text-shadow: 1px 1px #eee;
display: block;
padding-left: 20px;
background: url(../images/app/icons/arrow-small.png) 0 50% no-repeat;
@@ -937,7 +936,7 @@ ul.formats li a {
display: block;
padding: 3px 5px 4px 5px;
color: #777;
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
font-weight: bold;
}
@@ -1039,7 +1038,7 @@ li#nmembers a { background: url(../images/app/icons/members.png) 50% 0 no-repea
#admin-nav li.selected {
background: url(../images/app/nav-selected.png) bottom left no-repeat;
- text-shadow: 2px 2px #eee;
+ text-shadow: 1px 1px #eee;
}
#admin-nav li.selected a {
@@ -1067,7 +1066,7 @@ li#nmembers a { background: url(../images/app/icons/members.png) 50% 0 no-repea
color: #555;
font-weight: bold;
text-align: center;
- text-shadow: 2px 2px #f7f7f7;
+ text-shadow: 1px 1px #f7f7f7;
}
#second-nav li a:hover {
@@ -1237,7 +1236,7 @@ input.path {
.sync-percent {
color: #333;
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
font-weight: bold;
float: right;
}
@@ -1392,7 +1391,7 @@ input.path {
.overlay-form h2 {
margin-right: 8px;
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
border-bottom: 1px solid #bbb;
padding: 10px;
}
@@ -1410,7 +1409,7 @@ div.oform p label {
font-weight: bold;
margin-top: 10px;
padding: 5px 0;
- text-shadow: 2px 2px #fff;
+ text-shadow: 1px 1px #fff;
}
.oform p {
@@ -1539,6 +1538,20 @@ button {
display: none;
}
+#changesets li.changeset {
+ background: none;
+ border: none;
+ border-bottom: 1px solid #ccc;
+}
+
+#changesets .cs-log {
+ background: none;
+}
+
+#changesets .cs-meta {
+ background: none;
+ border-right: none;
+}
/* @end */
/* @group Command Line */
Please sign in to comment.
Something went wrong with that request. Please try again.