diff --git a/app/assets/javascripts/discourse/components/search.js b/app/assets/javascripts/discourse/components/search.js index ae7338771..a05a28e1a 100644 --- a/app/assets/javascripts/discourse/components/search.js +++ b/app/assets/javascripts/discourse/components/search.js @@ -12,13 +12,20 @@ Discourse.Search = { @method forTerm @param {String} term The term to search for - @param {String} typeFilter An optional filter to restrict the search by type + @param {Object} opts Options for searching + @param {String} opts.typeFilter Filter our results to one type only + @param {Ember.Object} opts.searchContext data to help searching within a context (say, a category or user) @return {Promise} a promise that resolves the search results **/ - forTerm: function(term, typeFilter) { - return Discourse.ajax('/search', { - data: { term: term, type_filter: typeFilter } - }); + forTerm: function(term, opts) { + if (!opts) opts = {}; + + // Only include the data we have + var data = { term: term } + if (opts.typeFilter) data.typeFilter = opts.typeFilter; + if (opts.searchContext) data.search_context = opts.searchContext; + + return Discourse.ajax('/search', { data: data }); } } diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js index f209d5cc8..b0940bea2 100644 --- a/app/assets/javascripts/discourse/controllers/composer_controller.js +++ b/app/assets/javascripts/discourse/controllers/composer_controller.js @@ -27,6 +27,10 @@ Discourse.ComposerController = Discourse.Controller.extend({ if (c) return c.appendText(text); }, + categories: function() { + return Discourse.Category.list(); + }.property(), + save: function(force) { var composer, _this = this, @@ -35,6 +39,13 @@ Discourse.ComposerController = Discourse.Controller.extend({ buttons; composer = this.get('content'); + + if( composer.get('cantSubmitPost') ) { + this.set('view.showTitleTip', true); + this.set('view.showReplyTip', true); + return; + } + composer.set('disableDrafts', true); // for now handle a very narrow use case @@ -324,6 +335,8 @@ Discourse.ComposerController = Discourse.Controller.extend({ close: function() { this.set('content', null); this.set('view.content', null); + this.set('view.showTitleTip', false); + this.set('view.showReplyTip', false); }, closeIfCollapsed: function() { diff --git a/app/assets/javascripts/discourse/controllers/header_controller.js b/app/assets/javascripts/discourse/controllers/header_controller.js index 6d60c8437..57529bb47 100644 --- a/app/assets/javascripts/discourse/controllers/header_controller.js +++ b/app/assets/javascripts/discourse/controllers/header_controller.js @@ -14,7 +14,11 @@ Discourse.HeaderController = Discourse.Controller.extend({ var topic = this.get('topic'); if (topic) topic.toggleStar(); return false; - } + }, + + categories: function() { + return Discourse.Category.list(); + }.property() }); diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js b/app/assets/javascripts/discourse/controllers/list_controller.js index 9c9bc4b42..c781917f0 100644 --- a/app/assets/javascripts/discourse/controllers/list_controller.js +++ b/app/assets/javascripts/discourse/controllers/list_controller.js @@ -8,21 +8,17 @@ **/ Discourse.ListController = Discourse.Controller.extend({ currentUserBinding: 'Discourse.currentUser', - categoriesBinding: 'Discourse.site.categories', categoryBinding: 'topicList.category', canCreateCategory: false, canCreateTopic: false, needs: ['composer', 'modal', 'listTopics'], availableNavItems: function() { - var hasCategories, loggedOn, summary; - summary = this.get('filterSummary'); - loggedOn = !!Discourse.get('currentUser'); - hasCategories = !!this.get('categories'); + var summary = this.get('filterSummary'); + var loggedOn = !!Discourse.get('currentUser'); return Discourse.SiteSettings.top_menu.split("|").map(function(i) { return Discourse.NavItem.fromText(i, { loggedOn: loggedOn, - hasCategories: hasCategories, countSummary: summary }); }).filter(function(i) { diff --git a/app/assets/javascripts/discourse/controllers/search_controller.js b/app/assets/javascripts/discourse/controllers/search_controller.js index f01cc4d68..c93fbc80a 100644 --- a/app/assets/javascripts/discourse/controllers/search_controller.js +++ b/app/assets/javascripts/discourse/controllers/search_controller.js @@ -25,7 +25,12 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, { var searchController = this; this.set('count', 0); - return Discourse.Search.forTerm(term, typeFilter).then(function(results) { + var searcher = Discourse.Search.forTerm(term, { + typeFilter: typeFilter, + searchContext: searchController.get('searchContext') + }); + + return searcher.then(function(results) { searchController.set('results', results); if (results) { searchController.set('noResults', results.length === 0); diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js index 0f941d238..ead6a0b02 100644 --- a/app/assets/javascripts/discourse/controllers/topic_controller.js +++ b/app/assets/javascripts/discourse/controllers/topic_controller.js @@ -29,6 +29,9 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected return (this.get('selectedPostsCount') > 0); }.property('selectedPostsCount'), + categories: function() { + return Discourse.Category.list(); + }.property(), canSelectAll: Em.computed.not('allPostsSelected'), diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js index 44d86537e..dd8caec7b 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js @@ -98,6 +98,21 @@ Ember.Handlebars.registerHelper('inputTip', function(options) { return Ember.Handlebars.helpers.view.call(this, Discourse.InputTipView, options); }); +/** + Inserts a Discourse.PopupInputTipView + + @method popupInputTip + @for Handlebars +**/ +Ember.Handlebars.registerHelper('popupInputTip', function(options) { + var hash = options.hash, + types = options.hashTypes; + + normalizeHash(hash, types); + + return Ember.Handlebars.helpers.view.call(this, Discourse.PopupInputTipView, options); +}); + /** Produces a bound link to a category diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js index 96a995c5d..46bc8af49 100644 --- a/app/assets/javascripts/discourse/models/category.js +++ b/app/assets/javascripts/discourse/models/category.js @@ -20,6 +20,10 @@ Discourse.Category = Discourse.Model.extend({ this.set("groups", Em.A(this.groups)); }, + searchContext: function() { + return ({ type: 'category', id: this.get('id') }); + }.property('id'), + url: function() { return Discourse.getURL("/category/") + (this.get('slug')); }.property('name'), diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js index c4a287379..68ceff6f6 100644 --- a/app/assets/javascripts/discourse/models/composer.js +++ b/app/assets/javascripts/discourse/models/composer.js @@ -276,7 +276,9 @@ Discourse.Composer = Discourse.Model.extend({ }, save: function(opts) { - return this.get('editingPost') ? this.editPost(opts) : this.createPost(opts); + if( !this.get('cantSubmitPost') ) { + return this.get('editingPost') ? this.editPost(opts) : this.createPost(opts); + } }, // When you edit a post diff --git a/app/assets/javascripts/discourse/models/nav_item.js b/app/assets/javascripts/discourse/models/nav_item.js index 0e256d665..7d268d634 100644 --- a/app/assets/javascripts/discourse/models/nav_item.js +++ b/app/assets/javascripts/discourse/models/nav_item.js @@ -34,7 +34,7 @@ Discourse.NavItem.reopenClass({ testName = name.split("/")[0]; if (!opts.loggedOn && !validAnon.contains(testName)) return null; - if (!opts.hasCategories && testName === "categories") return null; + if (!Discourse.Category.list() && testName === "categories") return null; if (!validNavNames.contains(testName)) return null; opts = { diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js index fcd225162..c86171a2c 100644 --- a/app/assets/javascripts/discourse/models/post.js +++ b/app/assets/javascripts/discourse/models/post.js @@ -128,7 +128,7 @@ Discourse.Post = Discourse.Model.extend({ return _this.get("actionByName." + (item.get('name_key')) + ".can_act"); }); return flags; - }.property('Discourse.site.flagTypes', 'actions_summary.@each.can_act'), + }.property('actions_summary.@each.can_act'), actionsHistory: function() { if (!this.present('actions_summary')) return null; @@ -220,7 +220,7 @@ Discourse.Post = Discourse.Model.extend({ obj.actions_summary.each(function(a) { var actionSummary; a.post = post; - a.actionType = Discourse.get("site").postActionTypeById(a.id); + a.actionType = Discourse.Site.instance().postActionTypeById(a.id); actionSummary = Discourse.ActionSummary.create(a); post.get('actions_summary').pushObject(actionSummary); lookup.set(a.actionType.get('name_key'), actionSummary); @@ -278,10 +278,9 @@ Discourse.Post.reopenClass({ if (result.actions_summary) { lookup = Em.Object.create(); result.actions_summary = result.actions_summary.map(function(a) { - var actionSummary; a.post = result; - a.actionType = Discourse.get("site").postActionTypeById(a.id); - actionSummary = Discourse.ActionSummary.create(a); + a.actionType = Discourse.Site.instance().postActionTypeById(a.id); + var actionSummary = Discourse.ActionSummary.create(a); lookup.set(a.actionType.get('name_key'), actionSummary); return actionSummary; }); @@ -290,8 +289,7 @@ Discourse.Post.reopenClass({ }, create: function(obj, topic) { - var result; - result = this._super(obj); + var result = this._super(obj); this.createActionSummary(result); if (obj.reply_to_user) { result.set('reply_to_user', Discourse.User.create(obj.reply_to_user)); diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js index d7e1a2696..b6df4e317 100644 --- a/app/assets/javascripts/discourse/models/topic.js +++ b/app/assets/javascripts/discourse/models/topic.js @@ -7,17 +7,16 @@ @module Discourse **/ Discourse.Topic = Discourse.Model.extend({ - categoriesBinding: 'Discourse.site.categories', - fewParticipants: (function() { + fewParticipants: function() { if (!this.present('participants')) return null; return this.get('participants').slice(0, 3); - }).property('participants'), + }.property('participants'), - canConvertToRegular: (function() { + canConvertToRegular: function() { var a = this.get('archetype'); return a !== 'regular' && a !== 'private_message'; - }).property('archetype'), + }.property('archetype'), convertArchetype: function(archetype) { var a = this.get('archetype'); @@ -30,11 +29,13 @@ Discourse.Topic = Discourse.Model.extend({ } }, + searchContext: function() { + return ({ type: 'topic', id: this.get('id') }); + }.property('id'), + category: function() { - if (this.get('categories')) { - return this.get('categories').findProperty('name', this.get('categoryName')); - } - }.property('categoryName', 'categories'), + return Discourse.Category.list().findProperty('name', this.get('categoryName')); + }.property('categoryName'), shareUrl: function(){ var user = Discourse.get('currentUser'); @@ -220,6 +221,7 @@ Discourse.Topic = Discourse.Model.extend({ // If loading the topic succeeded... var afterTopicLoaded = function(result) { + var closestPostNumber, lastPost, postDiff; // Update the slug if different @@ -246,6 +248,7 @@ Discourse.Topic = Discourse.Model.extend({ if (result.suggested_topics) { topic.set('suggested_topics', Em.A()); } + topic.mergeAttributes(result, { suggested_topics: Discourse.Topic }); topic.set('posts', Em.A()); if (opts.trackVisit && result.draft && result.draft.length > 0) { @@ -261,17 +264,18 @@ Discourse.Topic = Discourse.Model.extend({ // Okay this is weird, but let's store the length of the next post when there lastPost = null; result.posts.each(function(p) { - var post; p.scrollToAfterInsert = opts.nearPost; - post = Discourse.Post.create(p); + var post = Discourse.Post.create(p); post.set('topic', topic); topic.get('posts').pushObject(post); lastPost = post; }); + topic.set('loaded', true); } var errorLoadingTopic = function(result) { + topic.set('errorLoading', true); // If the result was 404 the post is not found diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js index 080bb6c63..fa1f462f8 100644 --- a/app/assets/javascripts/discourse/models/user.js +++ b/app/assets/javascripts/discourse/models/user.js @@ -28,6 +28,10 @@ Discourse.User = Discourse.Model.extend({ return Discourse.Utilities.avatarUrl(this.get('username'), 'small', this.get('avatar_template')); }).property('username'), + searchContext: function() { + return ({ type: 'user', id: this.get('username_lower') }); + }.property('username_lower'), + /** This user's website. diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js index 19c986af4..1b067d203 100644 --- a/app/assets/javascripts/discourse/routes/application_route.js +++ b/app/assets/javascripts/discourse/routes/application_route.js @@ -8,8 +8,7 @@ **/ Discourse.ApplicationRoute = Discourse.Route.extend({ setupController: function(controller) { - Discourse.set('site', Discourse.Site.instance()); - + //Discourse.set('site', Discourse.Site.instance()); var currentUser = PreloadStore.get('currentUser'); if (currentUser) { Discourse.set('currentUser', Discourse.User.create(currentUser)); diff --git a/app/assets/javascripts/discourse/routes/list_category_route.js b/app/assets/javascripts/discourse/routes/list_category_route.js index 7ac953083..a3fc1f599 100644 --- a/app/assets/javascripts/discourse/routes/list_category_route.js +++ b/app/assets/javascripts/discourse/routes/list_category_route.js @@ -47,7 +47,7 @@ Discourse.ListCategoryRoute = Discourse.FilteredListRoute.extend({ this._super(); // Add a search context - this.controllerFor('search').set('searchContext', this.modelFor('listCategory')); + this.controllerFor('search').set('searchContext', this.modelFor('listCategory').get('searchContext')); }, deactivate: function() { diff --git a/app/assets/javascripts/discourse/routes/topic_route.js b/app/assets/javascripts/discourse/routes/topic_route.js index 65a3b2eaf..34eb93415 100644 --- a/app/assets/javascripts/discourse/routes/topic_route.js +++ b/app/assets/javascripts/discourse/routes/topic_route.js @@ -25,7 +25,7 @@ Discourse.TopicRoute = Discourse.Route.extend({ Discourse.set('transient.lastTopicIdViewed', parseInt(topic.get('id'), 10)); // Set the search context - this.controllerFor('search').set('searchContext', topic); + this.controllerFor('search').set('searchContext', topic.get('searchContext')); }, deactivate: function() { diff --git a/app/assets/javascripts/discourse/routes/user_route.js b/app/assets/javascripts/discourse/routes/user_route.js index 8cb799187..d033f2654 100644 --- a/app/assets/javascripts/discourse/routes/user_route.js +++ b/app/assets/javascripts/discourse/routes/user_route.js @@ -28,7 +28,7 @@ Discourse.UserRoute = Discourse.Route.extend({ }); // Add a search context - this.controllerFor('search').set('searchContext', user); + this.controllerFor('search').set('searchContext', user.get('searchContext')); }, deactivate: function() { diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars index 800fcf194..aab1e64fe 100644 --- a/app/assets/javascripts/discourse/templates/composer.js.handlebars +++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars @@ -32,9 +32,14 @@ {{#if content.creatingPrivateMessage}} {{view Discourse.UserSelector topicIdBinding="controller.controllers.topic.content.id" excludeCurrentUser="true" id="private-message-users" class="span8" placeholderKey="composer.users_placeholder" tabindex="1" usernamesBinding="content.targetUsernames"}} {{/if}} - {{textField value=content.title tabindex="2" id="reply-title" maxlength="255" class="span8" placeholderKey="composer.title_placeholder"}} + +
+ {{textField value=content.title tabindex="2" id="reply-title" maxlength="255" class="span8" placeholderKey="composer.title_placeholder"}} + {{popupInputTip validation=view.titleValidation show=view.showTitleTip}} +
+ {{#unless content.creatingPrivateMessage}} - {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="Discourse.site.categories" valueBinding="content.categoryName"}} + {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" valueBinding="content.categoryName"}} {{#if content.archetype.hasOptions}} {{/if}} @@ -53,6 +58,7 @@
{{view Discourse.NotifyingTextArea parentBinding="view" tabindex="3" valueBinding="content.reply" id="wmd-input" placeholderKey="composer.reply_placeholder"}} + {{popupInputTip validation=view.replyValidation show=view.showReplyTip}}
@@ -70,7 +76,7 @@ {{#if Discourse.currentUser}}
- + {{i18n cancel}}
{{/if}} diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars index 02f31ce43..5294b0503 100644 --- a/app/assets/javascripts/discourse/templates/header.js.handlebars +++ b/app/assets/javascripts/discourse/templates/header.js.handlebars @@ -77,12 +77,12 @@ {{#titledLinkTo "list.latest" titleKey="filters.latest.help"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
  • {{#linkTo 'faq'}}{{i18n faq}}{{/linkTo}}
    • - {{#if view.categories}} + {{#if categories}}
  • {{#linkTo "list.categories"}}{{i18n filters.categories.title}}{{/linkTo}}
    • - {{#each view.categories}} + {{#each categories}}
  • {{categoryLink this}} {{unbound topic_count}} diff --git a/app/assets/javascripts/discourse/templates/popup_input_tip.js.handlebars b/app/assets/javascripts/discourse/templates/popup_input_tip.js.handlebars new file mode 100644 index 000000000..8fa9bc38f --- /dev/null +++ b/app/assets/javascripts/discourse/templates/popup_input_tip.js.handlebars @@ -0,0 +1,2 @@ + +{{view.validation.reason}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars index ff53bf1b0..ed5b894e4 100644 --- a/app/assets/javascripts/discourse/templates/topic.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars @@ -10,7 +10,7 @@ {{/if}} {{#if view.editingTopic}} - {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="Discourse.site.categories" sourceBinding="view.topic.categoryName"}} + {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" sourceBinding="view.topic.categoryName"}} {{else}} diff --git a/app/assets/javascripts/discourse/views/choose_topic_view.js b/app/assets/javascripts/discourse/views/choose_topic_view.js index e2c75e793..e0c4f4ebd 100644 --- a/app/assets/javascripts/discourse/views/choose_topic_view.js +++ b/app/assets/javascripts/discourse/views/choose_topic_view.js @@ -26,7 +26,7 @@ Discourse.ChooseTopicView = Discourse.View.extend({ search: Discourse.debounce(function(title) { var chooseTopicView = this; - Discourse.Search.forTerm(title, 'topic').then(function (facets) { + Discourse.Search.forTerm(title, {typeFilter: 'topic'}).then(function (facets) { if (facets && facets[0] && facets[0].results) { chooseTopicView.set('topics', facets[0].results); } else { diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js index f2154519b..2d8b7d0b5 100644 --- a/app/assets/javascripts/discourse/views/composer_view.js +++ b/app/assets/javascripts/discourse/views/composer_view.js @@ -369,7 +369,33 @@ Discourse.ComposerView = Discourse.View.extend({ $adminOpts.show(); $wmd.css('top', wmdTop + parseInt($adminOpts.css('height'),10) + 'px' ); } - } + }, + + titleValidation: function() { + var title = this.get('content.title'), reason; + if( !title || title.length < 1 ){ + reason = Em.String.i18n('composer.error.title_missing'); + } else if( title.length < Discourse.SiteSettings.min_topic_title_length || title.length > Discourse.SiteSettings.max_topic_title_length ) { + reason = Em.String.i18n('composer.error.title_length', {min: Discourse.SiteSettings.min_topic_title_length, max: Discourse.SiteSettings.max_topic_title_length}) + } + + if( reason ) { + return Discourse.InputValidation.create({ failed: true, reason: reason }); + } + }.property('content.title'), + + replyValidation: function() { + var reply = this.get('content.reply'), reason; + if( !reply || reply.length < 1 ){ + reason = Em.String.i18n('composer.error.post_missing'); + } else if( reply.length < Discourse.SiteSettings.min_post_length ) { + reason = Em.String.i18n('composer.error.post_length', {min: Discourse.SiteSettings.min_post_length}) + } + + if( reason ) { + return Discourse.InputValidation.create({ failed: true, reason: reason }); + } + }.property('content.reply') }); // not sure if this is the right way, keeping here for now, we could use a mixin perhaps diff --git a/app/assets/javascripts/discourse/views/header_view.js b/app/assets/javascripts/discourse/views/header_view.js index 924cf2073..afde98e86 100644 --- a/app/assets/javascripts/discourse/views/header_view.js +++ b/app/assets/javascripts/discourse/views/header_view.js @@ -11,9 +11,7 @@ Discourse.HeaderView = Discourse.View.extend({ classNames: ['d-header', 'clearfix'], classNameBindings: ['editingTopic'], templateName: 'header', - siteBinding: 'Discourse.site', currentUserBinding: 'Discourse.currentUser', - categoriesBinding: 'site.categories', topicBinding: 'Discourse.router.topicController.content', showDropdown: function($target) { diff --git a/app/assets/javascripts/discourse/views/input_tip_view.js b/app/assets/javascripts/discourse/views/input_tip_view.js index 108cf0c1d..f2f5eca37 100644 --- a/app/assets/javascripts/discourse/views/input_tip_view.js +++ b/app/assets/javascripts/discourse/views/input_tip_view.js @@ -7,7 +7,6 @@ @module Discourse **/ Discourse.InputTipView = Discourse.View.extend({ - templateName: 'input_tip', classNameBindings: [':tip', 'good', 'bad'], good: function() { diff --git a/app/assets/javascripts/discourse/views/list/list_view.js b/app/assets/javascripts/discourse/views/list/list_view.js index d9789ceb8..4c8b07ff4 100644 --- a/app/assets/javascripts/discourse/views/list/list_view.js +++ b/app/assets/javascripts/discourse/views/list/list_view.js @@ -9,7 +9,6 @@ Discourse.ListView = Discourse.View.extend({ templateName: 'list/list', composeViewBinding: Ember.Binding.oneWay('Discourse.composeView'), - categoriesBinding: 'Discourse.site.categories', // The window has been scrolled scrolled: function(e) { @@ -18,7 +17,7 @@ Discourse.ListView = Discourse.View.extend({ return currentView ? typeof currentView.scrolled === "function" ? currentView.scrolled(e) : void 0 : void 0; }, - createTopicText: (function() { + createTopicText: function() { if (this.get('controller.category.name')) { return Em.String.i18n("topic.create_in", { categoryName: this.get('controller.category.name') @@ -26,7 +25,7 @@ Discourse.ListView = Discourse.View.extend({ } else { return Em.String.i18n("topic.create"); } - }).property('controller.category.name') + }.property('controller.category.name') }); diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js index 46561d0dd..f67eab4f7 100644 --- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js +++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js @@ -55,16 +55,18 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({ // background colors are available as a pipe-separated string backgroundColors: function() { + var categories = Discourse.Category.list(); return Discourse.SiteSettings.category_colors.split("|").map(function(i) { return i.toUpperCase(); }).concat( - Discourse.site.categories.map(function(c) { return c.color.toUpperCase(); }) ).uniq(); + categories.map(function(c) { return c.color.toUpperCase(); }) ).uniq(); }.property('Discourse.SiteSettings.category_colors'), usedBackgroundColors: function() { - return Discourse.site.categories.map(function(c) { + var categories = Discourse.Category.list(); + return categories.map(function(c) { // If editing a category, don't include its color: return (this.get('category.id') && this.get('category.color').toUpperCase() === c.color.toUpperCase()) ? null : c.color.toUpperCase(); }, this).compact(); - }.property('Discourse.site.categories', 'category.id', 'category.color'), + }.property('category.id', 'category.color'), title: function() { if (this.get('category.id')) return Em.String.i18n("category.edit_long"); diff --git a/app/assets/javascripts/discourse/views/popup_input_tip_view.js b/app/assets/javascripts/discourse/views/popup_input_tip_view.js new file mode 100644 index 000000000..0b71b346f --- /dev/null +++ b/app/assets/javascripts/discourse/views/popup_input_tip_view.js @@ -0,0 +1,55 @@ +/** + This view extends the functionality of InputTipView with these extra features: + * it can be dismissed + * it bounces when it's shown + * it's absolutely positioned beside the input element, with the help of + extra css you'll need to write to line it up correctly. + + @class PopupInputTipView + @extends Discourse.View + @namespace Discourse + @module Discourse +**/ +Discourse.PopupInputTipView = Discourse.View.extend({ + templateName: 'popup_input_tip', + classNameBindings: [':popup-tip', 'good', 'bad', 'show::hide'], + animateAttribute: null, + bouncePixels: 6, + bounceDelay: 100, + + good: function() { + return !this.get('validation.failed'); + }.property('validation'), + + bad: function() { + return this.get('validation.failed'); + }.property('validation'), + + hide: function() { + this.set('show', false); + }, + + bounce: function() { + var $elem = this.$() + if( !this.animateAttribute ) { + this.animateAttribute = $elem.css('left') === 'auto' ? 'right' : 'left'; + } + if( this.animateAttribute === 'left' ) { + this.bounceLeft($elem); + } else { + this.bounceRight($elem); + } + }.observes('show'), + + bounceLeft: function($elem) { + for( var i = 0; i < 5; i++ ) { + $elem.animate({ left: '+=' + this.bouncePixels }, this.bounceDelay).animate({ left: '-=' + this.bouncePixels }, this.bounceDelay); + } + }, + + bounceRight: function($elem) { + for( var i = 0; i < 5; i++ ) { + $elem.animate({ right: '-=' + this.bouncePixels }, this.bounceDelay).animate({ right: '+=' + this.bouncePixels }, this.bounceDelay); + } + } +}); diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js index b4b717eb3..8118ce561 100644 --- a/app/assets/javascripts/discourse/views/topic_view.js +++ b/app/assets/javascripts/discourse/views/topic_view.js @@ -12,7 +12,6 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, { topicBinding: 'controller.content', userFiltersBinding: 'controller.userFilters', classNameBindings: ['controller.multiSelect:multi-select', 'topic.archetype', 'topic.category.secure:secure_category'], - siteBinding: 'Discourse.site', progressPosition: 1, menuVisible: true, SHORT_POST: 1200, diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss index 4d3e113c5..a1477934b 100644 --- a/app/assets/stylesheets/application/compose.css.scss +++ b/app/assets/stylesheets/application/compose.css.scss @@ -104,9 +104,6 @@ } #reply-control { - .requirements-not-met { - background-color: rgba(255, 0, 0, 0.12); - } .toggle-preview, #draft-status, #image-uploading { position: absolute; bottom: -31px; @@ -325,6 +322,15 @@ bottom: 8px; } } + .title-input { + position: relative; + display: inline; + .popup-tip { + width: 300px; + left: -8px; + margin-top: 8px; + } + } } .reply-to { @@ -450,6 +456,10 @@ div.ac-wrap { .textarea-wrapper { padding-right: 5px; float: left; + .popup-tip { + margin-top: 3px; + right: 4px; + } } .preview-wrapper { padding-left: 5px; diff --git a/app/assets/stylesheets/application/input_tip.css.scss b/app/assets/stylesheets/application/input_tip.css.scss new file mode 100644 index 000000000..fabfdaba7 --- /dev/null +++ b/app/assets/stylesheets/application/input_tip.css.scss @@ -0,0 +1,29 @@ +@import "foundation/variables"; +@import "foundation/mixins"; + +.popup-tip { + position: absolute; + display: block; + padding: 5px 10px; + z-index: 101; + @include border-radius-all(2px); + border: solid 1px #955; + &.bad { + background-color: #b66; + color: white; + box-shadow: 1px 1px 5px #777, inset 0 0 9px #b55; + } + &.hide, &.good { + display: none; + } + a.close { + float: right; + color: $black; + opacity: 0.5; + font-size: 15px; + margin-left: 4px; + } + a.close:hover { + opacity: 1.0; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/buttons.css.scss b/app/assets/stylesheets/components/buttons.css.scss index d65cd88dc..21bcefbf2 100644 --- a/app/assets/stylesheets/components/buttons.css.scss +++ b/app/assets/stylesheets/components/buttons.css.scss @@ -22,7 +22,7 @@ &:active { text-shadow: none; } - &[disabled] { + &[disabled], &.disabled { cursor: default; opacity: 0.4; } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 56a34ba9d..b116b51a4 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -338,6 +338,12 @@ en: need_more_for_title: "{{n}} to go for the title" need_more_for_reply: "{{n}} to go for the reply" + error: + title_missing: "Title is required." + title_length: "Title needs between {{min}} and {{max}} characters." + post_missing: "Post can't be empty." + post_length: "Post must be at least {{min}} characters long." + save_edit: "Save Edit" reply_original: "Reply on Original Topic" reply_here: "Reply Here"