summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Sørensen <johan@johansorensen.com>2009-09-10 09:57:16 +0200
committerJohan Sørensen <johan@johansorensen.com>2009-09-28 10:21:07 +0200
commite1c4df003e6e5f0b6204dd1df3afad1562dd75e0 (patch)
treece5f8fbfdcd6847a6a6cd5d611c5d34d661fde3f
parent7091f5f05c01cab1886155d00d98662f433ba9b0 (diff)
downloadgitorious-mainline-outdated-e1c4df003e6e5f0b6204dd1df3afad1562dd75e0.zip
gitorious-mainline-outdated-e1c4df003e6e5f0b6204dd1df3afad1562dd75e0.tar.gz
gitorious-mainline-outdated-e1c4df003e6e5f0b6204dd1df3afad1562dd75e0.tar.bz2
added icons and tweaked the styling a bit in the merge_request_version partial
-rw-r--r--app/views/merge_request_versions/_merge_request_version.html.erb2
-rw-r--r--public/javascripts/application.js10
-rw-r--r--public/stylesheets/base.css16
3 files changed, 25 insertions, 3 deletions
diff --git a/app/views/merge_request_versions/_merge_request_version.html.erb b/app/views/merge_request_versions/_merge_request_version.html.erb
index b62b357..365f4eb 100644
--- a/app/views/merge_request_versions/_merge_request_version.html.erb
+++ b/app/views/merge_request_versions/_merge_request_version.html.erb
@@ -26,7 +26,7 @@
<div class="file-diff">
<h4>
<a href="#" class="header" name="<%= h(force_utf8(file.a_path)) -%>">
- <%= h(file.a_path) -%>
+ <span class="closed"></span><%= h(file.a_path) -%>
</a>
</h4>
<div class="diff-hunks" style="display:none">
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 80b16af..4064023 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -205,18 +205,24 @@ $(document).ready(function() {
$('#merge_request_diff .file-diff a.header').live("click", function(event) {
var hunksContainer = $(this).parent().next();
if (hunksContainer.is(":visible")) {
+ $(this).find("span").removeClass("open").addClass("closed");
hunksContainer.slideUp();
} else {
+ $(this).find("span").removeClass("closed").addClass("open");
hunksContainer.slideDown();
}
event.preventDefault();
});
$("#merge_request_diff .file-diff-controls a#expand-all").live("click", function(e){
- $(this).parent().parent().parent().find('.diff-hunks:hidden').show();
+ var container = $(this).parent().parent().parent();
+ container.find('.file-diff a.header span').removeClass("closed").addClass("open");
+ container.find('.diff-hunks:hidden').show();
e.preventDefault();
});
$("#merge_request_diff .file-diff-controls a#collapse-all").live("click", function(e){
- $(this).parent().parent().parent().find('.diff-hunks').hide();
+ var container = $(this).parent().parent().parent();
+ container.find('.file-diff a.header span').removeClass("open").addClass("closed");
+ container.find('.diff-hunks').hide();
e.preventDefault();
});
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index ee3dacd..e880ace 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -2770,6 +2770,22 @@ Merge request commit selector
border-bottom: 1px solid #dee7ed;
margin-bottom: 5px;
}
+#merge_request_diff .file-diff:last-child {
+ border-bottom: none;
+}
+#merge_request_diff .file-diff h4 {
+ margin-bottom: 5px;
+}
+
+#merge_request_diff .file-diff a.header span {
+ padding-right: 20px;
+}
+#merge_request_diff .file-diff a.header span.open {
+ background: url('/images/silk/bullet_toggle_minus.png') no-repeat 0 0;
+}
+#merge_request_diff .file-diff a.header span.closed {
+ background: url('/images/silk/bullet_toggle_plus.png') no-repeat 0 0;
+}
#merge_request_diff .file-diff-controls {
float: right;