Settings package

.meteor/packages

@@ -94,3 +94,4 @@ telescope-tagline-banner
 # Custom Packages
 telescope-seo
 telescope-messages
+telescope-settings

.meteor/versions

@@ -134,6 +134,7 @@ telescope-releases@0.1.0
 telescope-rss@0.0.0
 telescope-search@0.0.0
 telescope-seo@0.0.5
+telescope-settings@0.0.0
 telescope-singleday@0.1.0
 telescope-subscribe-to-posts@0.1.0
 telescope-tagline-banner@0.1.0

client/helpers/handlebars.js

@@ -13,11 +13,6 @@ UI.registerHelper('eachWithRank', function(items, options) {
   });
   return out;
 });
-
-UI.registerHelper('getSetting', function(setting, defaultArgument){
-  setting = getSetting(setting, defaultArgument);
-  return setting;
-});
 UI.registerHelper('isLoggedIn', function() {
   return !!Meteor.user();
 });

client/main.js

@@ -1,5 +1,5 @@
 // Session variables
-Session.set('postsLimit', getSetting('postsPerPage', 10));
+Session.set('postsLimit', Settings.get('postsPerPage', 10));
 
 // Sort postModules array position using modulePositions as index
 postModules = _.sortBy(postModules, 'order');

client/views/admin/settings_form.html

@@ -1,7 +0,0 @@
-<template name="settings">
-  {{#if this.hasSettings}}
-    {{> quickForm collection="Settings" id="updateSettingsForm" type="update" doc=this.settings label-class="control-label" input-col-class="controls" template="telescope"}}
-  {{else}}
-    {{> quickForm collection="Settings" id="insertSettingsForm" type="insert" template="telescope" label-class="control-label" input-col-class="controls"}}
-  {{/if}}
-</template>

client/views/common/css.js

@@ -15,21 +15,21 @@ Template[getTemplate('css')].helpers({
 
       // loop over all properties, and add the relevant selectors
       _.each(properties, function (selector, property) {
-        css += selector + "{\n  " + property + ": " + getSetting(color) + ";\n}\n";
+        css += selector + "{\n  " + property + ": " + Settings.get(color) + ";\n}\n";
       });
     });
     return css;
   },
   headerTextColorHalfOpacity: function () {
-    return tinycolor(getSetting("headerTextColor")).setAlpha(0.5);
+    return tinycolor(Settings.get("headerTextColor")).setAlpha(0.5);
   },
   buttonColorHalfOpacity: function () {
-    return tinycolor(getSetting("buttonColor")).setAlpha(0.5);
+    return tinycolor(Settings.get("buttonColor")).setAlpha(0.5);
   },
   hideAuthClass: function () {
 
     var authClass = '';
-    var authMethods = getSetting('authMethods', ["email"]);
+    var authMethods = Settings.get('authMethods', ["email"]);
     var selectors = [
       {name: 'email', selector: ".at-pwd-form"},
       {name: 'twitter', selector: "#at-twitter"},

client/views/common/footer.js

@@ -1,6 +1,6 @@
 Template[getTemplate('footer')].helpers({
   footerCode: function(){
-    return getSetting('footerCode');
+    return Settings.get('footerCode');
   },
   footerClass: function(){
     return Session.get('isPostsList') ? 'absolute' : 'static';

client/views/common/layout.js

@@ -6,7 +6,7 @@ Template[getTemplate('layout')].helpers({
     return getTemplate('nav');
   },
   navLayout: function () {
-    return getSetting('navLayout', 'top-nav');
+    return Settings.get('navLayout', 'top-nav');
   },
   messages: function () {
     return getTemplate('messages');
@@ -24,7 +24,7 @@ Template[getTemplate('layout')].helpers({
     return getTemplate('css');
   },
   extraCode: function() {
-    return getSetting('extraCode');
+    return Settings.get('extraCode');
   },
   heroModules: function () {
     return _.sortBy(heroModules, 'order');
@@ -48,7 +48,7 @@ Template[getTemplate('layout')].rendered = function(){
   var link = document.createElement('link');
   link.type = 'image/x-icon';
   link.rel = 'shortcut icon';
-  link.href = getSetting('faviconUrl', '/img/favicon.ico');
+  link.href = Settings.get('faviconUrl', '/img/favicon.ico');
   document.getElementsByTagName('head')[0].appendChild(link);
 
 };

client/views/errors/no_account.js

@@ -1,6 +1,6 @@
 Template[getTemplate('no_account')].helpers({
   landingPageText: function(){
-    return getSetting("landingPageText");
+    return Settings.get("landingPageText");
   }
 });
 Template[getTemplate('no_account')].events({

client/views/errors/no_invite.js

@@ -1,5 +1,5 @@
 Template[getTemplate('no_invite')].helpers({
   afterSignupText: function(){
-    return getSetting("afterSignupText");
+    return Settings.get("afterSignupText");
   }
 });

client/views/nav/logo.js

@@ -1,8 +1,8 @@
 Template[getTemplate('logo')].helpers({
   site_title: function(){
-    return getSetting('title', "Telescope");
+    return Settings.get('title', "Telescope");
   },
   logo_url: function(){
-    return getSetting('logoUrl');
+    return Settings.get('logoUrl');
   }
 });

client/views/nav/nav.js

@@ -1,7 +1,7 @@
 Template[getTemplate('nav')].helpers({
   headerClass: function () {
     var headerClass = "";
-    var bgBrightness = tinycolor(getSetting('headerColor')).getBrightness();
+    var bgBrightness = tinycolor(Settings.get('headerColor')).getBrightness();
     if (bgBrightness < 50) {
       headerClass += " dark-bg";
     } else if (bgBrightness < 130) {
@@ -33,7 +33,7 @@ Template[getTemplate('nav')].helpers({
     if (this.length > 3) {
       dropdownClass += "long-dropdown";
     }
-    if (getSetting('navLayout', 'top-nav') == 'top-nav' && getThemeSetting('useDropdowns', true)) {
+    if (Settings.get('navLayout', 'top-nav') == 'top-nav' && getThemeSetting('useDropdowns', true)) {
       dropdownClass += "has-dropdown";
     } else {
       dropdownClass += "no-dropdown";

client/views/nav/user_menu.js

@@ -8,7 +8,7 @@ Template[getTemplate('userMenu')].helpers({
   menuMode: function () {
     if (!!this.mobile) {
       return 'list';
-    } else if (getSetting('navLayout', 'top-nav') === 'top-nav') {
+    } else if (Settings.get('navLayout', 'top-nav') === 'top-nav') {
       return 'dropdown';
     } else {
       return 'accordion';

client/views/posts/modules/post_admin.js

@@ -3,7 +3,7 @@ Template[getTemplate('postAdmin')].helpers({
     return this.status == STATUS_PENDING;
   },
   showUnapprove: function(){
-    return !!getSetting('requirePostsApproval') && this.status == STATUS_APPROVED;
+    return !!Settings.get('requirePostsApproval') && this.status == STATUS_APPROVED;
   },
   shortScore: function(){
     return Math.floor(this.score*1000)/1000;

client/views/posts/post_list/posts_list.js

@@ -4,7 +4,7 @@ Template[getTemplate('posts_list')].created = function() {
 
 Template[getTemplate('posts_list')].helpers({
   postsLayout: function () {
-    return getSetting('postsLayout', 'posts-list');
+    return Settings.get('postsLayout', 'posts-list');
   },
   description: function () {
     var controller = Iron.controller();

client/views/posts/post_view_nav.js

@@ -1,13 +1,13 @@
 Template[getTemplate('postViewsNav')].helpers({
   showNav: function () {
-    var navElements = getSetting('postViews', _.pluck(viewsMenu, 'route'));
+    var navElements = Settings.get('postViews', _.pluck(viewsMenu, 'route'));
     var navCount = (typeof navElements === "array") ? navElements.length : _.keys(navElements).length;
     return navCount > 1;
   },
   menuItems: function () {
     var defaultViews = _.pluck(viewsMenu, 'route');
     var menuItems = _.filter(viewsMenu, function (item) {
-      if (!_.contains(getSetting('postViews', defaultViews), item.route) || (item.adminOnly && !isAdmin(Meteor.user()))) {
+      if (!_.contains(Settings.get('postViews', defaultViews), item.route) || (item.adminOnly && !isAdmin(Meteor.user()))) {
         // don't show the item
         return false;
       }

collections/comments.js

@@ -226,7 +226,7 @@ Meteor.methods({
     if (!hasAdminRights) {
 
       var timeSinceLastComment = timeSinceLast(user, Comments),
-          commentInterval = Math.abs(parseInt(getSetting('commentInterval',15)));
+          commentInterval = Math.abs(parseInt(Settings.get('commentInterval',15)));
 
       // check that user waits more than 15 seconds between comments
       if((timeSinceLastComment < commentInterval))

collections/posts.js

@@ -231,7 +231,7 @@ getPostProperties = function (post) {
 // default status for new posts
 getDefaultPostStatus = function (user) {
   var hasAdminRights = typeof user === 'undefined' ? false : isAdmin(user);
-  if (hasAdminRights || !getSetting('requirePostsApproval', false)) {
+  if (hasAdminRights || !Settings.get('requirePostsApproval', false)) {
     // if user is admin, or else post approval is not required
     return STATUS_APPROVED
   } else {
@@ -408,8 +408,8 @@ Meteor.methods({
 
       var timeSinceLastPost=timeSinceLast(user, Posts),
         numberOfPostsInPast24Hours=numberOfItemsInPast24Hours(user, Posts),
-        postInterval = Math.abs(parseInt(getSetting('postInterval', 30))),
+        postInterval = Math.abs(parseInt(Settings.get('postInterval', 30))),
-        maxPostsPer24Hours = Math.abs(parseInt(getSetting('maxPostsPerDay', 30)));
+        maxPostsPer24Hours = Math.abs(parseInt(Settings.get('maxPostsPerDay', 30)));
 
       // check that user waits more than X seconds between posts
       if(timeSinceLastPost < postInterval)

lib/analytics.js

@@ -1,7 +1,7 @@
 analyticsInit = _.once(function() {
 
   // Mixpanel
-  if (mixpanelId=getSetting("mixpanelId")){
+  if (mixpanelId=Settings.get("mixpanelId")){
     (function (c, a) {
     window.mixpanel = a;
     var b, d, h, e;
@@ -33,7 +33,7 @@ analyticsInit = _.once(function() {
   }
 
   // GoSquared
-  if (goSquaredId = getSetting("goSquaredId")) {
+  if (goSquaredId = Settings.get("goSquaredId")) {
     window.GoSquared = {};
     GoSquared.acct = goSquaredId;
     window._gstc_lt = +new Date();
@@ -45,7 +45,7 @@ analyticsInit = _.once(function() {
   }
 
   // Clicky
-  if ((clickyId = getSetting("clickyId"))){
+  if ((clickyId = Settings.get("clickyId"))){
     clicky_site_ids = [];
     clicky_site_ids.push(clickyId);
     (function() {
@@ -58,7 +58,7 @@ analyticsInit = _.once(function() {
   }
 
   // Google Analytics
-  if (googleAnalyticsId = getSetting("googleAnalyticsId")){
+  if (googleAnalyticsId = Settings.get("googleAnalyticsId")){
 
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

lib/config/at_config.js

@@ -1,6 +1,6 @@
 /* global
     AccountsTemplates: false,
-    getSetting: false
+    Settings: false
 */
 
 //////////////////////////////////
@@ -9,8 +9,8 @@
 
 if (Meteor.isServer) {
   Meteor.startup(function () {
-    Accounts.emailTemplates.siteName = getSetting('title');
+    Accounts.emailTemplates.siteName = Settings.get('title');
-    Accounts.emailTemplates.from = getSetting('defaultEmail');
+    Accounts.emailTemplates.from = Settings.get('defaultEmail');
   });
 }
 

lib/debug.js

@@ -1,4 +1,4 @@
 clog = function (s) {
-  if(getSetting('debug', false))
+  if(Settings.get('debug', false))
     console.log(s);
-}
+};

lib/helpers.js

@@ -102,7 +102,7 @@ getDomain = function(url){
   return urlObject.parse(url).hostname.replace('www.', '');
 };
 invitesEnabled = function () {
-  return getSetting("requireViewInvite") || getSetting("requirePostInvite");
+  return Settings.get("requireViewInvite") || Settings.get("requirePostInvite");
 };
 getOutgoingUrl = function(url){
   return getRouteUrl('out', {}, {query: {url: url}});

lib/router/admin.js

@@ -6,21 +6,6 @@ AdminController = RouteController.extend({
 
 Meteor.startup(function (){
 
-  // Settings
-
-  Router.route('/settings', {
-    controller: AdminController,
-    name: 'settings',
-    // layoutTemplate: getTemplate('adminLayout'),
-    data: function () {
-      // we only have one set of settings for now
-      return {
-        hasSettings: !!Settings.find().count(),
-        settings: Settings.findOne()
-      }
-    }
-  });
-
  // Loading (for testing purposes)
 
   Router.route('/loading', {

lib/router/filters.js

@@ -133,7 +133,7 @@ Router._filters = {
 
   setTitle: function () {
     // if getTitle is set, use it. Otherwise default to site title.
-    var title = (typeof this.getTitle === 'function') ? this.getTitle() : getSetting("title", "Telescope");
+    var title = (typeof this.getTitle === 'function') ? this.getTitle() : Settings.get("title", "Telescope");
     document.title = title;
   }
 

lib/router/posts.js

@@ -18,7 +18,7 @@ PostsListController = RouteController.extend({
     // note: most of the time this.params.slug will be empty
     this._terms = {
       view: this.view,
-      limit: this.params.limit || getSetting('postsPerPage', 10),
+      limit: this.params.limit || Settings.get('postsPerPage', 10),
       category: this.params.slug
     };
 
@@ -57,7 +57,7 @@ PostsListController = RouteController.extend({
       hasMorePosts: this._terms.limit == postsCount,
       loadMoreHandler: function () {
 
-        var count = parseInt(Session.get('postsLimit')) + parseInt(getSetting('postsPerPage', 10));
+        var count = parseInt(Session.get('postsLimit')) + parseInt(Settings.get('postsPerPage', 10));
         var categorySegment = Session.get('categorySlug') ? Session.get('categorySlug') + '/' : '';
 
         // TODO: use Router.path here?
@@ -67,12 +67,12 @@ PostsListController = RouteController.extend({
   },
 
   getTitle: function () {
-    return i18n.t(this.view) + ' - ' + getSetting('title', "Telescope");
+    return i18n.t(this.view) + ' - ' + Settings.get('title', "Telescope");
   },
 
   getDescription: function () {
     if (Router.current().route.getName() == 'posts_default') { // return site description on root path
-      return getSetting('description');
+      return Settings.get('description');
     } else {
       return i18n.t(_.findWhere(viewsMenu, {label: this.view}).description);
     }
@@ -86,7 +86,7 @@ PostsListController = RouteController.extend({
 });
 
 var getDefaultViewController = function () {
-  var defaultView = getSetting('defaultView', 'top');
+  var defaultView = Settings.get('defaultView', 'top');
   defaultView = defaultView.charAt(0).toUpperCase() + defaultView.slice(1);
   return eval("Posts"+defaultView+"Controller");
 };
@@ -96,8 +96,8 @@ Meteor.startup(function () {
 
   PostsDefaultController = getDefaultViewController().extend({
     getTitle: function () {
-      var title = getSetting('title', 'Telescope');
+      var title = Settings.get('title', 'Telescope');
-      var tagline = getSetting('tagline');
+      var tagline = Settings.get('tagline');
       var fullTitle = !!tagline ? title + ' – ' + tagline : title ;
       return fullTitle;
     }
@@ -143,7 +143,7 @@ PostPageController = RouteController.extend({
 
   getTitle: function () {
     if (!!this.post())
-      return this.post().title + ' - ' + getSetting('title', "Telescope");
+      return this.post().title + ' - ' + Settings.get('title', "Telescope");
   },
 
   onBeforeAction: function() {

lib/router/server.js

@@ -53,7 +53,7 @@ Meteor.startup(function (){
       var emailProperties = {
         profileUrl: getProfileUrl(user),
         username: getUserName(user),
-        siteTitle: getSetting('title'),
+        siteTitle: Settings.get('title'),
         siteUrl: getSiteUrl()
       };
       html = Handlebars.templates[getTemplate('emailAccountApproved')](emailProperties);

lib/router/users.js

@@ -26,7 +26,7 @@ UserPageController = RouteController.extend({
   },
 
   getTitle: function () {
-    return getDisplayName(this.getUser()) + ' - ' + getSetting('title', "Telescope");
+    return getDisplayName(this.getUser()) + ' - ' + Settings.get('title', "Telescope");
   },
 
   getDescription: function () {

lib/vote.js

@@ -82,7 +82,7 @@ upvoteItem = function (collection, item, user) {
 
       // if karma redistribution is enabled, give karma to all previous upvoters of the post
       // (but not to the person doing the upvoting)
-      if (getSetting('redistributeKarma', false)) {
+      if (Settings.get('redistributeKarma', false)) {
         _.each(item.upvoters, function (upvoterId) {
           // share the karma equally among all upvoters, but cap the value at 0.1
           var karmaIncrease = Math.min(0.1, votePower/item.upvoters.length);

packages/telescope-base/lib/base.js

@@ -3,7 +3,6 @@
 // array containing properties to be added to the post/settings/comments schema on startup.
 addToPostSchema = [];
 addToCommentsSchema = [];
-addToSettingsSchema = [];
 addToUserSchema = [];
 
 SimpleSchema.extendOptions({
@@ -25,7 +24,7 @@ postStatuses = [
     value: 3,
     label: 'Rejected'
   }
-]
+];
 
 STATUS_PENDING=1;
 STATUS_APPROVED=2;
@@ -139,7 +138,7 @@ userMenu = [
     label: 'sign_out',
     description: 'sign_out'
   }
-]
+];
 // ------------------------------------- Views -------------------------------- //
 
 
@@ -160,19 +159,19 @@ viewParameters.top = function (terms) {
   return {
     options: {sort: {sticky: -1, score: -1}}
   };
-}
+};
 
 viewParameters.new = function (terms) {
   return {
     options: {sort: {sticky: -1, postedAt: -1}}
   };
-}
+};
 
 viewParameters.best = function (terms) {
   return {
     options: {sort: {sticky: -1, baseScore: -1}}
   };
-}
+};
 
 viewParameters.pending = function (terms) {
   return {
@@ -182,21 +181,21 @@ viewParameters.pending = function (terms) {
     options: {sort: {createdAt: -1}},
     showFuture: true
   };
-}
+};
 
 viewParameters.scheduled = function (terms) {
   return {
     find: {postedAt: {$gte: new Date()}},
     options: {sort: {postedAt: -1}}
   };
-}
+};
 
 viewParameters.userPosts = function (terms) {
   return {
     find: {userId: terms.userId},
     options: {limit: 5, sort: {postedAt: -1}}
   };
-}
+};
 
 viewParameters.userUpvotedPosts = function (terms) {
   var user = Meteor.users.findOne(terms.userId);
@@ -205,7 +204,7 @@ viewParameters.userUpvotedPosts = function (terms) {
     find: {_id: {$in: postsIds}, userId: {$ne: terms.userId}}, // exclude own posts
     options: {limit: 5, sort: {postedAt: -1}}
   };
-}
+};
 
 viewParameters.userDownvotedPosts = function (terms) {
   var user = Meteor.users.findOne(terms.userId);
@@ -215,7 +214,7 @@ viewParameters.userDownvotedPosts = function (terms) {
     find: {_id: {$in: postsIds}},
     options: {limit: 5, sort: {postedAt: -1}}
   };
-}
+};
 
 heroModules = [];
 
@@ -287,7 +286,7 @@ postMeta = [
     template: 'postAdmin',
     order: 50
   }
-]
+];
 // ------------------------------ Callbacks ------------------------------ //
 
 postClassCallbacks = [];
@@ -358,7 +357,7 @@ userProfileEdit = [
     template: 'userAccount',
     order: 1
   }
-]
+];
 
 userProfileCompleteChecks.push(
   function(user) {
@@ -373,7 +372,7 @@ templates = {}
 getTemplate = function (name) {
   // if template has been overwritten, return this; else return template name
   return !!templates[name] ? templates[name] : name;
-}
+};
 
 // ------------------------------ Theme Settings ------------------------------ //
 

packages/telescope-base/package.js

@@ -20,7 +20,6 @@ Package.onUse(function (api) {
     'userMenu',
     'addToPostSchema',
     'addToCommentsSchema',
-    'addToSettingsSchema', 
     'addToUserSchema',
     'preloadSubscriptions',
     'primaryNav',

packages/telescope-blank/lib/settings.js

@@ -11,4 +11,4 @@ var customSetting = {
     }
   }
 }
-addToSettingsSchema.push(customSetting);
+Settings.addToSchema(customSetting);

packages/telescope-blank/package.js

@@ -19,6 +19,7 @@ Package.onUse(function (api) {
     'iron:router',                // routing package
     'telescope-base',             // basic Telescope hooks and objects
     'telescope-lib',              // useful functions
+    'telescope-settings',
     'telescope-i18n',             // internationalization wrapper
     'fourseven:scss'              // SCSS compilation package
   ]);

packages/telescope-daily/lib/routes.js

@@ -31,7 +31,7 @@ PostsDailyController = RouteController.extend({
   },
 
   getTitle: function () {
-    return i18n.t('daily') + ' - ' + getSetting('title', "Telescope");
+    return i18n.t('daily') + ' - ' + Settings.get('title', "Telescope");
   },
 
   getDescription: function () {

packages/telescope-daily/package.js

@@ -5,6 +5,7 @@ Package.onUse(function (api) {
   api.use([
     'telescope-lib',
     'telescope-base',
+    'telescope-settings',
     'iron:router',
     'meteorhacks:fast-render',
     'meteorhacks:subs-manager',

packages/telescope-email/lib/server/email.js

@@ -15,18 +15,18 @@ getEmailTemplate = function (template) {
 buildEmailTemplate = function (htmlContent) {
 
   var emailProperties = {
-    headerColor: getSetting('headerColor', '#444444'),
+    headerColor: Settings.get('headerColor', '#444444'),
-    buttonColor: getSetting('buttonColor', '#DD3416'),
+    buttonColor: Settings.get('buttonColor', '#DD3416'),
-    siteName: getSetting('title'),
+    siteName: Settings.get('title'),
-    tagline: getSetting('tagline'),
+    tagline: Settings.get('tagline'),
     siteUrl: getSiteUrl(),
     body: htmlContent,
     unsubscribe: '',
     accountLink: getSiteUrl()+'account',
-    footer: getSetting('emailFooter'),
+    footer: Settings.get('emailFooter'),
-    logoUrl: getSetting('logoUrl'),
+    logoUrl: Settings.get('logoUrl'),
-    logoHeight: getSetting('logoHeight'),
+    logoHeight: Settings.get('logoHeight'),
-    logoWidth: getSetting('logoWidth')
+    logoWidth: Settings.get('logoWidth')
   }
 
   var emailHTML = Handlebars.templates[getTemplate('emailWrapper')](emailProperties);
@@ -43,8 +43,8 @@ sendEmail = function(to, subject, html, text){
   // TODO: limit who can send emails
   // TODO: fix this error: Error: getaddrinfo ENOTFOUND
 
-  var from = getSetting('defaultEmail', 'noreply@example.com');
+  var from = Settings.get('defaultEmail', 'noreply@example.com');
-  var siteName = getSetting('title', 'Telescope');
+  var siteName = Settings.get('title', 'Telescope');
   var subject = '['+siteName+'] '+subject;
 
   if (typeof text == 'undefined'){
@@ -82,7 +82,7 @@ buildAndSendEmail = function (to, subject, template, properties) {
 Meteor.methods({
   testEmail: function () {
     if(isAdminById(this.userId)){
-      var email = buildAndSendEmail (getSetting('defaultEmail'), 'Telescope email test', 'emailTest', {date: new Date()});
+      var email = buildAndSendEmail (Settings.get('defaultEmail'), 'Telescope email test', 'emailTest', {date: new Date()});
     }
   }
 })

packages/telescope-email/package.js

@@ -13,6 +13,7 @@ Package.onUse(function (api) {
   api.use([
     'iron:router',
     'telescope-base',
+    'telescope-settings',
     'telescope-lib',
     'telescope-i18n',
     'tap:i18n'

packages/telescope-embedly/lib/client/autoform-postthumbnail.js

@@ -61,8 +61,8 @@ Template.afPostThumbnail.helpers({
     return atts;
   },
   style: function () {
-    var thumbnailWidth = getSetting('thumbnailWidth', 200);
+    var thumbnailWidth = Settings.get('thumbnailWidth', 200);
-    var thumbnailHeight = getSetting('thumbnailHeight', 125);
+    var thumbnailHeight = Settings.get('thumbnailHeight', 125);
     return "width: "+thumbnailWidth+"px; height: "+thumbnailHeight+"px;"
   },
   embedlyKeyExists: function () {

packages/telescope-embedly/lib/embedly.js

@@ -41,7 +41,7 @@ var embedlyKeyProperty = {
     }
   }
 }
-addToSettingsSchema.push(embedlyKeyProperty);
+Settings.addToSchema(embedlyKeyProperty);
 
 var thumbnailWidthProperty = {
   propertyName: 'thumbnailWidth',
@@ -53,7 +53,7 @@ var thumbnailWidthProperty = {
     }
   }
 }
-addToSettingsSchema.push(thumbnailWidthProperty);
+Settings.addToSchema(thumbnailWidthProperty);
 
 var thumbnailHeightProperty = {
   propertyName: 'thumbnailHeight',
@@ -65,7 +65,7 @@ var thumbnailHeightProperty = {
     }
   }
 }
-addToSettingsSchema.push(thumbnailHeightProperty);
+Settings.addToSchema(thumbnailHeightProperty);
 
 // add callback that adds "has-thumbnail" or "no-thumbnail" CSS classes
 postClassCallbacks.push(function (post, postClass){

packages/telescope-embedly/lib/server/get_embedly_data.js

@@ -1,9 +1,9 @@
 getEmbedlyData = function (url) {
   var data = {}
   var extractBase = 'http://api.embed.ly/1/extract';
-  var embedlyKey = getSetting('embedlyKey');
+  var embedlyKey = Settings.get('embedlyKey');
-  var thumbnailWidth = getSetting('thumbnailWidth', 200);
+  var thumbnailWidth = Settings.get('thumbnailWidth', 200);
-  var thumbnailHeight = getSetting('thumbnailHeight', 125);
+  var thumbnailHeight = Settings.get('thumbnailHeight', 125);
 
   if(!embedlyKey) {
     // fail silently to still let the post be submitted as usual
@@ -106,7 +106,7 @@ Meteor.methods({
     return getEmbedlyData(url);
   },
   embedlyKeyExists: function () {
-    return !!getSetting('embedlyKey');
+    return !!Settings.get('embedlyKey');
   },
   regenerateEmbedlyData: function (post) {
     if (can.edit(Meteor.user(), post)) {

packages/telescope-embedly/package.js

@@ -12,6 +12,7 @@ Package.onUse( function(api) {
   api.use([
     'telescope-lib',
     'telescope-base',
+    'telescope-settings',
     'aldeed:autoform',
     'tap:i18n',
     'fourseven:scss',

packages/telescope-i18n/i18n.js

@@ -33,7 +33,7 @@ setLanguage = function (language) {
 i18n = {
   t: function (str, options) {
     if (Meteor.isServer) {
-      return TAPi18n.__(str, options, getSetting('language', 'en')); 
+      return TAPi18n.__(str, options, Settings.get('language', 'en'));
     } else {
       return TAPi18n.__(str, options);
     }
@@ -56,7 +56,7 @@ Meteor.startup(function () {
     //   }
     // });
 
-    setLanguage(getSetting('language', 'en'));
+    setLanguage(Settings.get('language', 'en'));
   }
 
 });

packages/telescope-invites/lib/invites.js

@@ -35,7 +35,7 @@ userProfileEdit.push({
 
  function setStartingInvites (user) {
   // give new users a few invites (default to 3)
-  user.inviteCount = getSetting('startInvitesCount', 3);
+  user.inviteCount = Settings.get('startInvitesCount', 3);
   return user;
 }
 userCreatedCallbacks.push(setStartingInvites);

packages/telescope-invites/lib/server/invites.js

@@ -59,7 +59,7 @@ Meteor.methods({
         }});
       }
 
-      var communityName = getSetting('title','Telescope'),
+      var communityName = Settings.get('title','Telescope'),
           emailSubject = 'You are invited to try '+communityName,
           emailProperties = {
             newUser : typeof user === 'undefined',

packages/telescope-invites/package.js

@@ -18,6 +18,7 @@ Package.onUse(function (api) {
     'tap:i18n',
     'iron:router',
     'telescope-base',
+    'telescope-settings',
     'telescope-lib',
     'telescope-i18n',
     'aldeed:simple-schema',

packages/telescope-kadira/lib/kadira-settings.js

@@ -8,8 +8,8 @@ var kadiraAppIdProperty = {
       group: 'kadira'
     }
   }
-}
+};
-addToSettingsSchema.push(kadiraAppIdProperty);
+Settings.addToSchema(kadiraAppIdProperty);
 
 var kadiraAppSecretProperty = {
   propertyName: 'kadiraAppSecret',
@@ -22,5 +22,5 @@ var kadiraAppSecretProperty = {
       private: true
     }
   }
-}
+};
-addToSettingsSchema.push(kadiraAppSecretProperty);
+Settings.addToSchema(kadiraAppSecretProperty);

packages/telescope-kadira/lib/server/kadira.js

@@ -1,5 +1,5 @@
 Meteor.startup(function() {
-  if(!!getSetting('kadiraAppId') && !!getSetting('kadiraAppSecret')){
+  if(!!Settings.get('kadiraAppId') && !!Settings.get('kadiraAppSecret')){
-    Kadira.connect(getSetting('kadiraAppId'), getSetting('kadiraAppSecret'));
+    Kadira.connect(Settings.get('kadiraAppId'), Settings.get('kadiraAppSecret'));
   }
 });

packages/telescope-kadira/package.js

@@ -10,6 +10,7 @@ Package.onUse(function (api) {
     'templating',
     'telescope-lib',
     'telescope-base',
+    'telescope-settings',
     'tap:i18n',
     'meteorhacks:kadira@2.20.1'
   ], ['client', 'server']);

packages/telescope-lib/lib/lib.js

@@ -1,29 +1,7 @@
 getSiteUrl = function () {
-  return getSetting('siteUrl', Meteor.absoluteUrl());
+  return Settings.get('siteUrl', Meteor.absoluteUrl());
-}
-
-getSetting = function(setting, defaultValue){
-  var settings = Settings.find().fetch()[0];
-
-  if (Meteor.isServer && Meteor.settings && !!Meteor.settings[setting]) { // if on the server, look in Meteor.settings
-    return Meteor.settings[setting];
-
-  } else if (Meteor.settings && Meteor.settings.public && !!Meteor.settings.public[setting]) { // look in Meteor.settings.public
-    return Meteor.settings.public[setting];
-
-  } else if(settings && (typeof settings[setting] !== 'undefined')) { // look in Settings collection
-    return settings[setting];
-
-  } else if (typeof defaultValue !== 'undefined') { // fallback to default
-    return  defaultValue;
-
-  } else { // or return undefined
-    return undefined;
-  }
-
 };
 
-
 removeSetting = function (setting) {
   var settings = Settings.find().fetch()[0];
   console.log(settings._id)
@@ -45,15 +23,15 @@ getThemeSetting = function(setting, defaultValue){
 
 camelToDash = function (str) {
   return str.replace(/\W+/g, '-').replace(/([a-z\d])([A-Z])/g, '$1-$2').toLowerCase();
-}
+};
 
 camelCaseify = function(str) {
   return dashToCamel(str.replace(' ', '-'));
-}
+};
 
 dashToCamel = function (str) {
   return str.replace(/(\-[a-z])/g, function($1){return $1.toUpperCase().replace('-','');});
-}
+};
 
 trimWords = function(s, numWords) {
   expString = s.split(/\s+/,numWords);
@@ -64,4 +42,4 @@ trimWords = function(s, numWords) {
 
 capitalise = function (string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
-}
+};

packages/telescope-lib/lib/permissions.js

@@ -8,7 +8,7 @@ can = {};
 //
 // return true if all is well, false
 can.view = function (user) {
-  if (getSetting('requireViewInvite', false)) {
+  if (Settings.get('requireViewInvite', false)) {
 
     if (Meteor.isClient) {
       // on client only, default to the current user
@@ -32,7 +32,7 @@ can.viewRejectedPosts = function (user) {
 
 can.viewById = function (userId) {
   // if an invite is required to view, run permission check, else return true
-  if (getSetting('requireViewInvite', false)) {
+  if (Settings.get('requireViewInvite', false)) {
     return !!userId ? can.view(Meteor.users.findOne(userId)) : false;
   }
   return true;
@@ -44,7 +44,7 @@ can.post = function (user, returnError) {
     return returnError ? "no_account" : false;
   } else if (isAdmin(user)) {
     return true;
-  } else if (getSetting('requirePostInvite')) {
+  } else if (Settings.get('requirePostInvite')) {
     if (user.isInvited) {
       return true;
     } else {

packages/telescope-lib/package.js

@@ -29,7 +29,6 @@ Package.onUse(function (api) {
     'camelToDash',
     'dashToCamel',
     'camelCaseify',
-    'getSetting',
     'removeSetting',
     'getThemeSetting',
     'getSiteUrl',

packages/telescope-module-share/lib/client/post_share.js

@@ -4,7 +4,7 @@ Meteor.startup(function () {
       return !!this.url ? this.url : getSiteUrl() + "posts/"+this._id;
     },
     viaTwitter: function () {
-      return !!getSetting('twitterAccount') ? 'via='+getSetting('twitterAccount') : '';
+      return !!Settings.get('twitterAccount') ? 'via='+Settings.get('twitterAccount') : '';
     }
   });
 

packages/telescope-module-share/package.js

@@ -2,7 +2,12 @@ Package.describe({summary: "Telescope share module package"});
 
 Package.onUse(function (api) {
 
-  api.use(['telescope-lib', 'telescope-base', 'fourseven:scss'], ['client', 'server']);
+  api.use([
+    'telescope-lib',
+    'telescope-base',
+    'telescope-settings',
+    'fourseven:scss'
+  ], ['client', 'server']);
 
   api.use([
     'jquery',

packages/telescope-newsletter/lib/client/templates/newsletter_banner.js

@@ -22,7 +22,7 @@ var dismissBanner = function () {
 Meteor.startup(function () {
   Template[getTemplate('newsletterBanner')].helpers({
     siteName: function () {
-      return getSetting('title');
+      return Settings.get('title');
     },
     isNotConnected: function () {
       return !Meteor.user()
@@ -30,7 +30,7 @@ Meteor.startup(function () {
     showBanner: function () {
       // note: should not be reactive
       if(
-            getSetting('showBanner', false) == false
+            Settings.get('showBanner', false) == false
         ||  !can.view(Meteor.user())
         ||  Router.current().location.get().path != '/'
         ||  Cookie.get('showBanner') == "no"

packages/telescope-newsletter/lib/newsletter.js

@@ -55,7 +55,7 @@ var enableNewsletter = {
     }
   }
 }
-addToSettingsSchema.push(enableNewsletter);
+Settings.addToSchema(enableNewsletter);
 
 var showBanner = {
   propertyName: 'showBanner',
@@ -69,7 +69,7 @@ var showBanner = {
     }
   }
 }
-addToSettingsSchema.push(showBanner);
+Settings.addToSchema(showBanner);
 
 var mailChimpAPIKey = {
   propertyName: 'mailChimpAPIKey',
@@ -82,7 +82,7 @@ var mailChimpAPIKey = {
     }
   }
 }
-addToSettingsSchema.push(mailChimpAPIKey);
+Settings.addToSchema(mailChimpAPIKey);
 
 var mailChimpListId = {
   propertyName: 'mailChimpListId',
@@ -96,7 +96,7 @@ var mailChimpListId = {
     }
   }
 }
-addToSettingsSchema.push(mailChimpListId);
+Settings.addToSchema(mailChimpListId);
 
 var postsPerNewsletter = {
   propertyName: 'postsPerNewsletter',
@@ -108,7 +108,7 @@ var postsPerNewsletter = {
     }
   }
 }
-addToSettingsSchema.push(postsPerNewsletter);
+Settings.addToSchema(postsPerNewsletter);
 
 var newsletterFrequency = {
   propertyName: 'newsletterFrequency',
@@ -139,7 +139,7 @@ var newsletterFrequency = {
     }
   }
 }
-addToSettingsSchema.push(newsletterFrequency);
+Settings.addToSchema(newsletterFrequency);
 
 var newsletterTime = {
   propertyName: 'newsletterTime',
@@ -154,7 +154,7 @@ var newsletterTime = {
     }
   }
 }
-addToSettingsSchema.push(newsletterTime);
+Settings.addToSchema(newsletterTime);
 
 var autoSubscribe = {
   propertyName: 'autoSubscribe',
@@ -167,7 +167,7 @@ var autoSubscribe = {
     }
   }
 }
-addToSettingsSchema.push(autoSubscribe);
+Settings.addToSchema(autoSubscribe);
 
 // create new "campaign" lens for all posts from the past X days that haven't been scheduled yet
 viewParameters.campaign = function (terms) {
@@ -188,7 +188,7 @@ heroModules.push({
 });
 
  function subscribeUserOnCreation (user) {
-  if (!!getSetting('autoSubscribe') && !!getEmail(user)) {
+  if (!!Settings.get('autoSubscribe') && !!getEmail(user)) {
     addToMailChimpList(user, false, function (error, result) {
       console.log(error)
       console.log(result)

packages/telescope-newsletter/lib/server/campaign.js

@@ -3,7 +3,7 @@ defaultPosts = 5;
 
 getCampaignPosts = function (postsCount) {
 
-  var newsletterFrequency = getSetting('newsletterFrequency', defaultFrequency);
+  var newsletterFrequency = Settings.get('newsletterFrequency', defaultFrequency);
 
   // look for last scheduled campaign in the database
   var lastCampaign = SyncedCron._collection.findOne({name: 'Schedule newsletter'}, {sort: {finishedAt: -1}, limit: 1});
@@ -52,7 +52,7 @@ buildCampaign = function (postsArray) {
 
   // 2. Wrap posts HTML in digest template
   var digestHTML = getEmailTemplate('emailDigest')({
-    siteName: getSetting('title'),
+    siteName: Settings.get('title'),
     date: moment().format("dddd, MMMM Do YYYY"),
     content: postsHTML
   });
@@ -71,7 +71,7 @@ buildCampaign = function (postsArray) {
 
 scheduleNextCampaign = function (isTest) {
   var isTest = typeof isTest === 'undefined' ? false : isTest;
-  var posts = getCampaignPosts(getSetting('postsPerNewsletter', defaultPosts));
+  var posts = getCampaignPosts(Settings.get('postsPerNewsletter', defaultPosts));
   if(!!posts.length){
     return scheduleCampaign(buildCampaign(posts), isTest);
   }else{

packages/telescope-newsletter/lib/server/cron.js

@@ -9,7 +9,7 @@ defaultFrequency = 7; // once a week
 defaultTime = '00:00';
 
 var getSchedule = function (parser) {
-  var frequency = getSetting('newsletterFrequency', defaultFrequency);
+  var frequency = Settings.get('newsletterFrequency', defaultFrequency);
   var recur = parser.recur();
   var schedule;
   switch (frequency) {
@@ -32,7 +32,7 @@ var getSchedule = function (parser) {
     default: // Once a week (Mondays)
       schedule = recur.on(2).dayOfWeek();
   }
-  return schedule.on(getSetting('newsletterTime', defaultTime)).time();
+  return schedule.on(Settings.get('newsletterTime', defaultTime)).time();
 }
 
 Meteor.methods({
@@ -56,7 +56,7 @@ var addJob = function () {
   });
 }
 Meteor.startup(function () {
-  if (getSetting('enableNewsletter', false)) {
+  if (Settings.get('enableNewsletter', false)) {
     addJob();
   }
 });

packages/telescope-newsletter/lib/server/mailchimp.js

@@ -3,8 +3,8 @@ var htmlToText = Npm.require('html-to-text');
 scheduleCampaign = function (campaign, isTest) {
   var isTest = typeof isTest === 'undefined' ? false : isTest;
 
-  var apiKey = getSetting('mailChimpAPIKey');
+  var apiKey = Settings.get('mailChimpAPIKey');
-  var listId = getSetting('mailChimpListId');
+  var listId = Settings.get('mailChimpListId');
 
   if(!!apiKey && !!listId){
 
@@ -19,14 +19,14 @@ scheduleCampaign = function (campaign, isTest) {
 
       var api = new MailChimp(apiKey);
       var text = htmlToText.fromString(campaign.html, {wordwrap: 130});
-      var defaultEmail = getSetting('defaultEmail');			
+      var defaultEmail = Settings.get('defaultEmail');
       var campaignOptions = {
         type: 'regular',
         options: {
           list_id: listId,
           subject: subject,
           from_email: defaultEmail,
-          from_name: getSetting('title')+ ' Top Posts',
+          from_name: Settings.get('title')+ ' Top Posts',
         },
         content: {
           html: campaign.html,
@@ -91,8 +91,8 @@ addToMailChimpList = function(userOrEmail, confirm, done){
       throw 'User must have an email address';
   }
 
-  var apiKey = getSetting('mailChimpAPIKey');
+  var apiKey = Settings.get('mailChimpAPIKey');
-  var listId = getSetting('mailChimpListId');
+  var listId = Settings.get('mailChimpListId');
 
   // add a user to a MailChimp list.
   // called when a new user is created, or when an existing user fills in their email

packages/telescope-newsletter/lib/server/routes.js

@@ -4,7 +4,7 @@ Meteor.startup(function () {
     name: 'campaign',
     where: 'server',
     action: function() {
-      var campaign = buildCampaign(getCampaignPosts(getSetting('postsPerNewsletter', 5)));
+      var campaign = buildCampaign(getCampaignPosts(Settings.get('postsPerNewsletter', 5)));
       var campaignSubject = '<div class="campaign-subject"><strong>Subject:</strong> '+campaign.subject+' (note: contents might change)</div>';
       var campaignSchedule = '<div class="campaign-schedule"><strong>Scheduled for:</strong> '+ Meteor.call('getNextJob') +'</div>';
 

packages/telescope-newsletter/package.js

@@ -13,6 +13,7 @@ Package.onUse(function (api) {
   api.use([
     'telescope-lib',
     'telescope-base',
+    'telescope-settings',
     'aldeed:simple-schema',
     'iron:router',
     'miro:mailchimp',

packages/telescope-notifications/lib/client/templates/notifications_menu.js

@@ -33,7 +33,7 @@ Template[getTemplate('notificationsMenu')].helpers({
   menuMode: function () {
     if (!!this.mobile) {
       return 'list';
-    } else if (getSetting('navLayout', 'top-nav') === 'top-nav') {
+    } else if (Settings.get('navLayout', 'top-nav') === 'top-nav') {
       return 'dropdown';
     } else {
       return 'accordion';

packages/telescope-notifications/lib/herald.js

@@ -11,7 +11,7 @@ Meteor.startup(function () {
   });
 
   // disable all email notifications when "emailNotifications" is set to false
-  Herald.settings.overrides.email = !getSetting('emailNotifications', true);
+  Herald.settings.overrides.email = !Settings.get('emailNotifications', true);
 
 });
 

packages/telescope-notifications/lib/notifications.js

@@ -95,7 +95,7 @@ var emailNotifications = {
     }
   }
 };
-addToSettingsSchema.push(emailNotifications);
+Settings.addToSchema(emailNotifications);
 
 // make it possible to disable notifications on a per-comment basis
 addToCommentsSchema.push(

packages/telescope-notifications/package.js

@@ -9,6 +9,7 @@ Package.onUse(function (api) {
   api.use([
     'telescope-lib',
     'telescope-base',
+    'telescope-settings',
     'telescope-email',
     'iron:router',
     'kestanous:herald@1.3.0',

packages/telescope-rss/lib/server/rss.js

@@ -1,10 +1,10 @@
 var RSS = Npm.require('rss');
 
 var getMeta = function(url) {
-  var siteUrl = getSetting('siteUrl', Meteor.absoluteUrl());
+  var siteUrl = Settings.get('siteUrl', Meteor.absoluteUrl());
   return {
-    title: getSetting('title'),
+    title: Settings.get('title'),
-    description: getSetting('tagline'),
+    description: Settings.get('tagline'),
     feed_url: siteUrl+url,
     site_url: siteUrl,
     image_url: siteUrl+'img/favicon.png',

packages/telescope-rss/package.js

@@ -4,7 +4,11 @@ Npm.depends({rss: "0.3.2"});
 
 Package.onUse(function (api) {
 
-  api.use(['telescope-base', 'telescope-lib'], ['server']);
+  api.use([
+    'telescope-base',
+    'telescope-lib',
+    'telescope-settings'
+  ], ['server']);
 
   api.add_files(['lib/server/rss.js', 'lib/server/routes.js'], ['server']);
 

packages/telescope-search/lib/client/routes.js

@@ -4,10 +4,10 @@ Meteor.startup(function () {
     view: 'search',
     showViewsNav: false,
     getTitle: function() {
-      return i18n.t("Search") + ' - ' + getSetting('title', "Telescope");
+      return i18n.t("Search") + ' - ' + Settings.get('title', "Telescope");
     },
     getDescription: function() {
-      return getSetting('description');
+      return Settings.get('description');
     },
     onBeforeAction: function() {
       var query = this.params.query;

packages/telescope-search/package.js

@@ -2,7 +2,12 @@ Package.describe({summary: "Telescope search package"});
 
 Package.onUse(function (api) {
 
-  api.use(['telescope-lib', 'telescope-base', 'aldeed:simple-schema'], ['client', 'server']);
+  api.use([
+    'telescope-lib',
+    'telescope-base',
+    'telescope-settings',
+    'aldeed:simple-schema'
+  ], ['client', 'server']);
 
   api.use([
     'jquery',

packages/telescope-seo/lib/routes.js

@@ -4,7 +4,7 @@ Meteor.startup(function() {
     var props = {meta: {}, og: {}};
     var title = this.getTitle && this.getTitle();
     var description = this.getDescription && this.getDescription();
-    var image = getSetting("siteImage");
+    var image = Settings.get("siteImage");
     if (title) {
       props.og.title = title;
     }

packages/telescope-seo/lib/seo.js

@@ -1,5 +1,5 @@
 // Add SEO settings.
-addToSettingsSchema.push({
+Settings.addToSchema({
   propertyName: "siteImage",
   propertySchema: {
     type: String,

packages/telescope-seo/lib/server/sitemaps.js

@@ -16,7 +16,7 @@ Meteor.startup(function() {
 
     // Posts list pages
     var paths = [
-      {page: "/", lastmod: _getLatest(getSetting("defaultView", "top")), changefreq: "hourly"},
+      {page: "/", lastmod: _getLatest(Settings.get("defaultView", "top")), changefreq: "hourly"},
       {page: "/top", lastmod: _getLatest("top"), changefreq: "hourly"},
       {page: "/new", lastmod: _getLatest("new"), changefreq: "hourly"},
       {page: "/best", lastmod: _getLatest("best"), changefreq: "daily"},

packages/telescope-seo/package.js

@@ -13,6 +13,7 @@ Package.onUse(function(api) {
     "iron:router",
     "telescope-lib",
     "telescope-base",
+    "telescope-settings",
     "telescope-i18n",
     "manuelschoebel:ms-seo@0.4.1",
     "gadicohen:sitemaps@0.0.20"

packages/telescope-settings/lib/client/helpers.js

@@ -0,0 +1,6 @@
+/* global Settings: false */
+
+Template.registerHelper('getSetting', function(setting, defaultArgument){
+  setting = Settings.get(setting, defaultArgument);
+  return setting;
+});

packages/telescope-settings/lib/client/language_changer.js

@@ -0,0 +1,12 @@
+var query = Settings.collection.find();
+
+query.observeChanges({
+  added: function (id, fields) {
+    if (fields.language)
+      setLanguage(fields.language);
+  },
+  changed: function (id, fields) {
+    if (fields.language)
+      setLanguage(fields.language);
+  }
+});

packages/telescope-settings/lib/client/templates/settings_form.html

@@ -0,0 +1,7 @@
+<template name="settings">
+  {{#if this.hasSettings}}
+    {{> quickForm collection="Settings.collection" id="updateSettingsForm" type="update" doc=this.settings label-class="control-label" input-col-class="controls" template="telescope"}}
+  {{else}}
+    {{> quickForm collection="Settings.collection" id="insertSettingsForm" type="insert" template="telescope" label-class="control-label" input-col-class="controls"}}
+  {{/if}}
+</template>

packages/telescope-settings/lib/client/templates/settings_form.js

@@ -1,13 +1,4 @@
-AutoForm.hooks({
+AutoForm.addHooks(['updateSettingsForm', 'insertSettingsForm'], {
-  updateSettingsForm: {
-
-    before: {
-      update: function(modifier) {
-        this.template.$('button[type=submit]').addClass('loading');
-        return modifier;
-      }
-    },
-
     onSuccess: function(operation, result) {
       this.template.$('button[type=submit]').removeClass('loading');
     },
@@ -15,24 +6,24 @@ AutoForm.hooks({
     onError: function(operation, result, template) {
       this.template.$('button[type=submit]').removeClass('loading');
     }
+});
+
+AutoForm.hooks({
+  updateSettingsForm: {
+    before: {
+      update: function(modifier) {
+        this.template.$('button[type=submit]').addClass('loading');
+        return modifier;
+      }
+    }
 
   },
   insertSettingsForm: {
-
     before: {
       insert: function(doc) {
         this.template.$('button[type=submit]').addClass('loading');
         return doc;
       }
-    },
-
-    onSuccess: function(operation, result) {
-      this.template.$('button[type=submit]').removeClass('loading');
-    },
-
-    onError: function(operation, result) {
-      this.template.$('button[type=submit]').removeClass('loading');
     }
-
   }
 });

packages/telescope-settings/lib/router.js

@@ -0,0 +1,18 @@
+Meteor.startup(function () {
+  // Settings
+
+  Router.route('/settings', {
+    controller: AdminController,
+    name: 'settings',
+    // layoutTemplate: getTemplate('adminLayout'),
+    data: function () {
+      // we only have one set of settings for now
+
+      var settings = Settings.collection.findOne();
+      return {
+        hasSettings: !!settings,
+        settings: settings
+      };
+    }
+  });
+});

packages/telescope-settings/lib/server/publications.js

@@ -2,8 +2,8 @@ Meteor.publish('settings', function() {
   var options = {};
   var privateFields = {};
 
-  // look at SettingsSchema to see which fields should be kept private
+  // look at Settings.schema to see which fields should be kept private
-  _.each(SettingsSchema._schema, function( val, key ) {
+  _.each(Settings.schema._schema, function( val, key ) {
     if (val.autoform && !!val.autoform.private)
       privateFields[key] = false;
   });
@@ -13,5 +13,6 @@ Meteor.publish('settings', function() {
       fields: privateFields
     });
   }
-  return Settings.find({}, options);
+
+  return Settings.collection.find({}, options);
 });

packages/telescope-settings/lib/settings.js

@@ -1,4 +1,8 @@
-settingsSchemaObject = {
+Settings = {
+  collection: new Meteor.Collection("settings")
+};
+
+Settings.schema = new SimpleSchema({
   title: {
     type: String,
     optional: true,
@@ -381,44 +385,53 @@ settingsSchemaObject = {
       instructions: 'Authentication methods (default to email only)'
     }
   }
-};
-
-// add any extra properties to settingsSchemaObject (provided by packages for example)
-_.each(addToSettingsSchema, function(item){
-  settingsSchemaObject[item.propertyName] = item.propertySchema;
 });
 
-Settings = new Meteor.Collection("settings");
+Settings.collection.attachSchema(Settings.schema);
-SettingsSchema = new SimpleSchema(settingsSchemaObject);
+
-Settings.attachSchema(SettingsSchema);
+Settings.addToSchema = function(item) {
+  var itemSchema = {};
+  itemSchema[item.propertyName] = item.propertySchema;
+
+  Settings.collection.attachSchema(itemSchema);
+  Settings.schema = new SimpleSchema(Settings.schema, itemSchema);
+};
+
+Settings.get = function(setting, defaultValue) {
+  var settings = Settings.collection.find().fetch()[0];
+
+  if (Meteor.isServer && Meteor.settings && !!Meteor.settings[setting]) { // if on the server, look in Meteor.settings
+    return Meteor.settings[setting];
+
+  } else if (Meteor.settings && Meteor.settings.public && !!Meteor.settings.public[setting]) { // look in Meteor.settings.public
+    return Meteor.settings.public[setting];
+
+  } else if(settings && (typeof settings[setting] !== 'undefined')) { // look in Settings collection
+    return settings[setting];
+
+  } else if (typeof defaultValue !== 'undefined') { // fallback to default
+    return  defaultValue;
+
+  } else { // or return undefined
+    return undefined;
+  }
+};
 
 // use custom template for checkboxes - not working yet
 // if(Meteor.isClient){
 //   AutoForm.setDefaultTemplateForType('afCheckbox', 'settings');
 // }
 
-Settings.allow({
+Meteor.startup(function () {
+  Settings.collection.allow({
     insert: isAdminById,
     update: isAdminById,
     remove: isAdminById
   });
-
-if (Meteor.isClient){
-  var query = Settings.find();
-  var handle = query.observeChanges({
-    added: function (id, fields) {
-      if (fields.language)
-        setLanguage(fields.language)
-    },
-    changed: function (id, fields) {
-      if (fields.language)
-        setLanguage(fields.language)
-    }
 });
-}
 
 Meteor.startup(function () {
   // override Meteor.absoluteUrl() with URL provided in settings
-  Meteor.absoluteUrl.defaultOptions.rootUrl = getSetting('siteUrl', Meteor.absoluteUrl());
+  Meteor.absoluteUrl.defaultOptions.rootUrl = Settings.get('siteUrl', Meteor.absoluteUrl());
-  debug = getSetting('debug', false);
+  debug = Settings.get('debug', false);
 });

packages/telescope-settings/package.js

@@ -0,0 +1,38 @@
+Package.describe({summary: "Telescope settings package"});
+
+Package.onUse(function(api) {
+  var both = ['server', 'client'];
+
+  api.use([
+    'mongo',
+    'underscore',
+
+    'aldeed:simple-schema',
+
+    'telescope-base',
+    'telescope-lib'
+  ], both);
+
+  api.use([
+    'templating',
+    'aldeed:autoform'
+  ], 'client');
+
+  api.addFiles([
+    'lib/settings.js',
+    'lib/router.js'
+  ], both);
+
+  api.addFiles([
+    'lib/server/publications.js',
+  ], 'server');
+
+  api.addFiles([
+    'lib/client/language_changer.js',
+    'lib/client/helpers.js',
+    'lib/client/templates/settings_form.html',
+    'lib/client/templates/settings_form.js'
+  ], 'client');
+
+  api.export('Settings', both);
+});

packages/telescope-singleday/lib/client/templates/single_day.js

@@ -11,7 +11,7 @@ Template[getTemplate('singleDay')].created = function () {
 
   // initialize the reactive variables
   instance.postsLoaded = new ReactiveVar(0);
-  instance.postsLimit = new ReactiveVar(getSetting('postsPerPage', 10));
+  instance.postsLimit = new ReactiveVar(Settings.get('postsPerPage', 10));
   instance.postsReady = new ReactiveVar(false);
 
   instance.getTerms = function () {
@@ -31,7 +31,7 @@ Template[getTemplate('singleDay')].created = function () {
   instance.autorun(function () {
     // just by including this session variable in the autorun, we automatically make it depend on it
     var currentDate = Session.get('currentDate');
-    instance.postsLimit.set(getSetting('postsPerPage', 10));
+    instance.postsLimit.set(Settings.get('postsPerPage', 10));
   });
 
   // will re-run when postsLimit or currentDate change
@@ -107,7 +107,7 @@ Template[getTemplate('singleDay')].helpers({
         // get current value for limit, i.e. how many posts are currently displayed
         var limit = instance.postsLimit.get();
         // increase limit by 5 and update it
-        limit += getSetting('postsPerPage', 10);
+        limit += Settings.get('postsPerPage', 10);
         instance.postsLimit.set(limit);
       },
 

packages/telescope-singleday/lib/routes.js

@@ -15,7 +15,7 @@ PostsSingledayController = RouteController.extend({
   },
 
   getTitle: function () {
-    return i18n.t('single_day') + ' - ' + getSetting('title', 'Telescope');
+    return i18n.t('single_day') + ' - ' + Settings.get('title', 'Telescope');
   },
 
   getDescription: function () {

packages/telescope-tagline-banner/lib/client/templates/tagline_banner.js

@@ -1,6 +1,6 @@
 Template[getTemplate('taglineBanner')].helpers({
   showTaglineBanner: function () {
-    return !!getSetting('tagline') && !!getSetting('showTaglineBanner');
+    return !!Settings.get('tagline') && !!Settings.get('showTaglineBanner');
   }
 });
 

packages/telescope-tagline-banner/lib/tagline.js

@@ -14,5 +14,5 @@ var showTaglineBanner = {
       instructions: 'Show tagline on homepage.'
     }
   }
-}
+};
-addToSettingsSchema.push(showTaglineBanner);
+Settings.addToSchema(showTaglineBanner);

packages/telescope-tagline-banner/package.js

@@ -13,6 +13,7 @@ Package.onUse(function (api) {
   api.use([
     'telescope-base',             // basic Telescope hooks and objects
     'telescope-lib',              // useful functions
+    'telescope-settings',
     'fourseven:scss',             // SCSS compilation package
     'tap:i18n'
   ]);

packages/telescope-tags/lib/client/templates/categories_menu.js

@@ -19,7 +19,7 @@ Meteor.startup(function () {
     menuMode: function () {
       if (!!this.mobile) {
         return 'list';
-      } else if (getSetting('navLayout', 'top-nav') === 'top-nav') {
+      } else if (Settings.get('navLayout', 'top-nav') === 'top-nav') {
         return 'dropdown';
       } else {
         return 'accordion';

packages/telescope-update-prompt/lib/server/phone_home.js

@@ -5,7 +5,7 @@ Meteor.methods({
 
     var params = {
       currentVersion: telescopeVersion,
-      siteTitle: getSetting('title'),
+      siteTitle: Settings.get('title'),
       siteUrl: getSiteUrl(),
       users: Meteor.users.find().count(),
       posts: Posts.find().count(),

server/migrations.js

@@ -497,7 +497,7 @@ var migrationsList = {
   },
   changeColorNames: function () {
     var i = 0;
-    var settings = Settings.findOne();
+    var settings = Settings.collection.findOne();
     var set = {};
 
     if (!!settings) {

server/publications/users.js

@@ -9,7 +9,7 @@ Meteor.publish('currentUser', function() {
 // TODO: find a better way
 
 Meteor.publish('allUsersAdmin', function() {
-  var selector = getSetting('requirePostInvite') ? {isInvited: true} : {}; // only users that can post
+  var selector = Settings.get('requirePostInvite') ? {isInvited: true} : {}; // only users that can post
   if (isAdminById(this.userId)) {
     return Meteor.users.find(selector, {fields: {
       _id: true,

server/scoring.js

@@ -1,5 +1,5 @@
 Meteor.startup(function () {
-  var scoreInterval = getSetting("scoreUpdateInterval") || 30;
+  var scoreInterval = Settings.get("scoreUpdateInterval") || 30;
   if (scoreInterval > 0) {
 
     // active items get updated every N seconds

server/start.js

@@ -6,5 +6,5 @@ Meteor.startup(function () {
   })
 });
 
-if (getSetting('mailUrl'))
+if (Settings.get('mailUrl'))
-  process.env.MAIL_URL = getSetting('mailUrl');
+  process.env.MAIL_URL = Settings.get('mailUrl');

tests/jasmine/client/unit/navSpec.js

@@ -27,7 +27,7 @@ describe('test nav template', function() {
   });
 
   it('should render the logo from the setting', function () {
-    spyOn(window, 'getSetting').and.callFake(function (settingName) {
+    spyOn(window, 'Settings.get').and.callFake(function (settingName) {
       return settingName;
     });
 
@@ -44,7 +44,7 @@ describe('test nav template', function() {
   });
 
   it('should render the site title if logo_url setting is empty', function () {
-    spyOn(window, 'getSetting').and.callFake(function (settingName) {
+    spyOn(window, 'Settings.get').and.callFake(function (settingName) {
       if (settingName === 'logoUrl') {
         return null;
       }