merge expandable branch; fixes #1638

app/assets/javascripts/dtext.js

@@ -1,11 +1,23 @@
 (function() {
   Danbooru.Dtext = {};
 
+  Danbooru.Dtext.initialize_all = function() {
+    Danbooru.Dtext.initialize_links();
+    Danbooru.Dtext.initialize_expandables();
+  }
+
   Danbooru.Dtext.initialize_links = function() {
     $(".simple_form .dtext-preview").hide();
     $(".simple_form input[value=Preview]").click(Danbooru.Dtext.click_button);
   }
 
+  Danbooru.Dtext.initialize_expandables = function() {
+    $(".expandable-content").hide();
+    $(".expandable-button").click(function(e) {
+      $(this).parent().next().fadeToggle("fast");
+    });
+  }
+
   Danbooru.Dtext.call_preview = function(e, $button, $input, $preview) {
     $button.val("Edit");
     $input.hide();
@@ -44,5 +56,5 @@
 })();
 
 $(document).ready(function() {
-  Danbooru.Dtext.initialize_links();
+  Danbooru.Dtext.initialize_all();
 });

app/assets/stylesheets/common/dtext.css.scss

@@ -40,9 +40,41 @@ div.prose {
     font-family: monospace;
     margin: 1em 0;
     padding: 1em 2em;
-    background: #eee;
+    background: #EEE;
     white-space: pre-wrap;
   }
+
+  div.expandable {
+    margin-bottom: 1em;
+    border: 1px solid #666;
+    background: #EEE;
+  }
+
+  div.expandable-header {
+    padding: 0.7em;
+
+    span {
+      margin-right: 1em;
+    }
+  }
+
+  div.expandable-button {
+    padding: 0.3em;
+    display: inline-block;
+    border: 1px solid #666;
+    border-radius: 3px;
+    background: #CCC;
+    cursor: pointer;
+  }
+
+  div.expandable-content {
+    padding: 0.7em;
+    border-top: 1px solid #666;
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
 }
 
 div.dtext-preview {