- {{#if category}}
- {{discourse-breadcrumbs category=category categories=categories}}
- {{/if}}
+ {{discourse-breadcrumbs category=category categories=categories}}
{{each availableNavItems itemViewClass="Discourse.NavItemView"}}
diff --git a/app/assets/javascripts/pagedown_custom.js b/app/assets/javascripts/pagedown_custom.js
index e7a0c885a24..eff6c090cf5 100644
--- a/app/assets/javascripts/pagedown_custom.js
+++ b/app/assets/javascripts/pagedown_custom.js
@@ -10,5 +10,29 @@ window.PagedownCustom = {
return Discourse.__container__.lookup('controller:composer').send('importQuote');
}
}
- ]
+ ],
+
+ customActions: {
+ "doBlockquote": function(chunk, postProcessing, oldDoBlockquote) {
+
+ // When traditional linebreaks are set, use the default Pagedown implementation
+ if (Discourse.SiteSettings.traditional_markdown_linebreaks) {
+ return oldDoBlockquote.call(this, chunk, postProcessing);
+ }
+
+ // Our custom blockquote for non-traditional markdown linebreaks
+ var result = [];
+ chunk.selection.split(/\n/).forEach(function (line) {
+ var newLine = "";
+ if (line.indexOf("> ") === 0) {
+ newLine += line.substr(2);
+ } else {
+ if (/\S/.test(line)) { newLine += "> " + line; }
+ }
+ result.push(newLine);
+ });
+ chunk.selection = result.join("\n");
+
+ }
+ }
};
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index fe69a38318a..5fb3b9cc2d7 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -342,8 +342,8 @@
.list-controls {
.home {
- font-size: 20px;
- font-weight: normal;
+ background-color: #eee;
+ color: #333;
}
.badge-category {
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 591499c24bc..8877ef4ea39 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -241,8 +241,8 @@
.list-controls {
.home {
- font-size: 20px;
- font-weight: normal;
+ color: #333;
+ background-color: #eee;
}
.badge-category {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 944550edb29..0be59d5f860 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -184,6 +184,8 @@ en:
"13": "Inbox"
categories:
+ all: "all categories"
+ all_subcategories: "all subcategories"
category: "Category"
posts: "Posts"
topics: "Topics"
diff --git a/vendor/assets/javascripts/Markdown.Editor.js b/vendor/assets/javascripts/Markdown.Editor.js
index bd2f2ac37f8..af4aa90975b 100644
--- a/vendor/assets/javascripts/Markdown.Editor.js
+++ b/vendor/assets/javascripts/Markdown.Editor.js
@@ -18,6 +18,17 @@
// ]
// };
//
+// To extend actions:
+//
+// window.PagedownCustom = {
+// customActions: {
+// "doBlockquote": function(chunk, postProcessing, oldDoBlockquote) {
+// console.log('custom blockquote called!');
+// return oldDoBlockquote.call(this, chunk, postProcessing);
+// }
+// }
+// };
+
(function () {
@@ -1470,6 +1481,17 @@
}
function bindCommand(method) {
+ if (typeof PagedownCustom != "undefined" && PagedownCustom.customActions) {
+ var custom = PagedownCustom.customActions[method];
+ if (custom) {
+ return function() {
+ var args = Array.prototype.slice.call(arguments);
+ args.push(commandManager[method]);
+ return custom.apply(commandManager, args);
+ };
+ }
+ }
+
if (typeof method === "string")
method = commandManager[method];
return function () { method.apply(commandManager, arguments); }