[gitg] Use expand/collapse all text instead of icon

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 043431303dd01f0778e4e015cdcb9a03d9b1aea6
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Fri Aug 7 09:22:38 2015 +0200

    Use expand/collapse all text instead of icon

 libgitg/gitg-diff-view.vala                   |    2 ++
 libgitg/resources/ui/diff-view/diff-view.css  |   14 +++++++++-----
 libgitg/resources/ui/diff-view/diff-view.html |    6 ++++--
 libgitg/resources/ui/diff-view/diff-view.js   |   18 ++++++------------
 4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 6b5c437..1bd82c0 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -271,6 +271,8 @@ namespace Gitg
                        strings.set_string_member("parents", _("Parents:"));
                        strings.set_string_member("diff_against", _("Diff against:"));
                        strings.set_string_member("committed_by", _("Committed by:"));
+                       strings.set_string_member("expand_all", _("Expand all"));
+                       strings.set_string_member("collapse_all", _("Collapse all"));
 
                        o.set_object_member("strings", strings);
 
diff --git a/libgitg/resources/ui/diff-view/diff-view.css b/libgitg/resources/ui/diff-view/diff-view.css
index 389cea4..7b21c93 100644
--- a/libgitg/resources/ui/diff-view/diff-view.css
+++ b/libgitg/resources/ui/diff-view/diff-view.css
@@ -65,7 +65,7 @@ div.commit .parents ul {
 }
 
 div.commit {
-  padding: 10px;
+  padding: 10px 10px 3px 10px;
   font-family: sans-serif;
   background: #f3f3f3;
 }
@@ -251,7 +251,8 @@ div.commit {
 }
 
 div.commit .date,
-div.commit .sha1 {
+div.commit .sha1,
+div.commit .expander-all {
   color: #888a85;
   font-size: 0.8em;
 }
@@ -269,12 +270,15 @@ div.commit .committer .date {
 div.commit .sha1 {
   font-family: monospace;
   text-align: right;
+  display: inline-block;
+  float: right;
+}
+
+div.commit .footer {
+  margin-top: 12px;
 }
 
 div.commit .expander-all {
-  float: right;
-  padding: 0px 0px 2px 6px;
-  vertical-align: middle;
   cursor: pointer;
 }
 
diff --git a/libgitg/resources/ui/diff-view/diff-view.html b/libgitg/resources/ui/diff-view/diff-view.html
index 15b40a1..d366c15 100644
--- a/libgitg/resources/ui/diff-view/diff-view.html
+++ b/libgitg/resources/ui/diff-view/diff-view.html
@@ -49,8 +49,10 @@
           </p>
           <p class="parents" data-id="parents">
           </p>
-          <div class="expander-all" data-id="expander-all">&#x25BC;</div>
-          <div class="sha1" data-id="sha1"></div>
+          <div class="footer">
+            <span class="expander-all" data-id="expander-all">Expand all</span>
+            <span class="sha1" data-id="sha1"></span>
+          </div>
         </div>
       </div>
       <div id="diff_content"></div>
diff --git a/libgitg/resources/ui/diff-view/diff-view.js b/libgitg/resources/ui/diff-view/diff-view.js
index 8ee721e..b14c449 100644
--- a/libgitg/resources/ui/diff-view/diff-view.js
+++ b/libgitg/resources/ui/diff-view/diff-view.js
@@ -31,7 +31,9 @@ var default_settings = {
                notes: 'Notes:',
                parents: 'Parents:',
                diff_against: 'Diff against:',
-               committed_by: 'Committed by:'
+               committed_by: 'Committed by:',
+               expand_all: 'Expand all',
+               collapse_all: 'Collapse all'
        },
 };
 
@@ -388,15 +390,7 @@ function collapsed_changed()
        });
 
        var expanderAll = $("#diff .expander-all");
-
-       if (!allUncollapsed)
-       {
-               expanderAll.text("\u25B6");
-       }
-       else
-       {
-               expanderAll.text("\u25BC");
-       }
+       expanderAll.text(allUncollapsed ? settings.strings.collapse_all : settings.strings.expand_all)
 }
 
 function next_element(elem)
@@ -598,7 +592,7 @@ function update_tab_width(width)
 
 function expand_collapse_all()
 {
-       var collapse = ($(this).text() === "\u25BC");
+       var collapse = ($(this).text() === settings.strings.collapse_all);
 
        var allbodies = document.querySelectorAll("#diff_content div.file:not(.background) table.file tbody");
 
@@ -613,7 +607,7 @@ function expand_collapse_all()
                }
        }
 
-       $(this).text(collapse ? "\u25B6" : "\u25BC")
+       $(this).text(collapse ? settings.strings.expand_all : settings.strings.collapse_all);
 }
 
 function default_collapse_all()