diff --git a/src/css/templates/index.scss b/src/css/templates/index.scss index 7a45f254c..7427faf37 100644 --- a/src/css/templates/index.scss +++ b/src/css/templates/index.scss @@ -6,4 +6,4 @@ All rights reserved. */ @import 'crafting_table'; -@import 'recipe_catalog'; +@import 'mod_pack'; diff --git a/src/css/templates/recipe_catalog.scss b/src/css/templates/mod_pack.scss similarity index 96% rename from src/css/templates/recipe_catalog.scss rename to src/css/templates/mod_pack.scss index 5b5c1adf4..32bf71fbb 100644 --- a/src/css/templates/recipe_catalog.scss +++ b/src/css/templates/mod_pack.scss @@ -5,7 +5,7 @@ Copyright (c) 2014 by Redwood Labs All rights reserved. */ -.view__recipe_catalog { +.view__mod_pack { button { @include center-vertical; position: absolute; right: 1em; diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee index d0da9ea8f..3d97b19af 100644 --- a/src/scripts/controllers/item_page_controller.coffee +++ b/src/scripts/controllers/item_page_controller.coffee @@ -8,7 +8,7 @@ BaseController = require './base_controller' CraftingTableController = require './crafting_table_controller' ItemPage = require '../models/item_page' -RecipeCatalogController = require './recipe_catalog_controller' +ModPackController = require './mod_pack_controller' ######################################################################################################################## @@ -29,6 +29,6 @@ module.exports = class ItemPageController extends BaseController # BaseController Overrides ##################################################################### onDidRender: -> - @catalogController = @addChild RecipeCatalogController, '.view__recipe_catalog', model:@model.catalog + @catalogController = @addChild ModPackController, '.view__mod_pack', model:@model.catalog @tableController = @addChild CraftingTableController, '.view__crafting_table', model:@model.table super diff --git a/src/scripts/controllers/recipe_catalog_controller.coffee b/src/scripts/controllers/mod_pack_controller.coffee similarity index 87% rename from src/scripts/controllers/recipe_catalog_controller.coffee rename to src/scripts/controllers/mod_pack_controller.coffee index 9c08cb4e1..97eb72ec2 100644 --- a/src/scripts/controllers/recipe_catalog_controller.coffee +++ b/src/scripts/controllers/mod_pack_controller.coffee @@ -1,5 +1,5 @@ ### -# Crafting Guide - recipe_catalog_controller.coffee +# Crafting Guide - mod_pack_controller.coffee # # Copyright (c) 2014 by Redwood Labs # All rights reserved. @@ -11,13 +11,13 @@ ModVersionController = require './mod_version_controller' ######################################################################################################################## -module.exports = class RecipeCatalogController extends BaseController +module.exports = class ModPackController extends BaseController constructor: (options={})-> if not options.model? then throw new Error "options.model is required" @_bookControllers = [] - options.templateName = 'recipe_catalog' + options.templateName = 'mod_pack' super options # BaseController Overrides ##################################################################### diff --git a/src/scripts/models/item_page.coffee b/src/scripts/models/item_page.coffee index 431210dfe..12dd9caf6 100644 --- a/src/scripts/models/item_page.coffee +++ b/src/scripts/models/item_page.coffee @@ -7,13 +7,13 @@ BaseModel = require './base_model' CraftingTable = require './crafting_table' -RecipeCatalog = require './recipe_catalog' +ModPack = require './mod_pack' ######################################################################################################################## module.exports = class ItemPage extends BaseModel constructor: (attributes={}, options={})-> - attributes.catalog ?= new RecipeCatalog + attributes.catalog ?= new ModPack attributes.table ?= new CraftingTable catalog:attributes.catalog super attributes, options diff --git a/src/scripts/models/recipe_catalog.coffee b/src/scripts/models/mod_pack.coffee similarity index 96% rename from src/scripts/models/recipe_catalog.coffee rename to src/scripts/models/mod_pack.coffee index 664a3a476..e8f45d141 100644 --- a/src/scripts/models/recipe_catalog.coffee +++ b/src/scripts/models/mod_pack.coffee @@ -1,5 +1,5 @@ ### -# Crafting Guide - recipe_catalog.coffee +# Crafting Guide - mod_pack.coffee # # Copyright (c) 2014 by Redwood Labs # All rights reserved. @@ -12,7 +12,7 @@ ModVersionParser = require './mod_version_parser' ######################################################################################################################## -module.exports = class RecipeCatalog extends BaseModel +module.exports = class ModPack extends BaseModel constructor: (attributes={}, options={})-> attributes.books ?= [] @@ -119,7 +119,7 @@ module.exports = class RecipeCatalog extends BaseModel # Object Overrides ############################################################################# toString: -> - return "RecipeCatalog (#{@cid}) {books:#{@books.length} items}" + return "ModPack (#{@cid}) {books:#{@books.length} items}" _sortBooks:-> @books.sort (a, b)-> diff --git a/src/templates/item_page.jade b/src/templates/item_page.jade index a35634e99..6986b17b7 100644 --- a/src/templates/item_page.jade +++ b/src/templates/item_page.jade @@ -7,4 +7,4 @@ .view__landing_page .view__crafting_table - .view__recipe_catalog + .view__mod_pack diff --git a/src/templates/recipe_catalog.jade b/src/templates/mod_pack.jade similarity index 85% rename from src/templates/recipe_catalog.jade rename to src/templates/mod_pack.jade index b33ef9408..9cf16a107 100644 --- a/src/templates/recipe_catalog.jade +++ b/src/templates/mod_pack.jade @@ -1,11 +1,11 @@ //- -//- Crafting Guide - recipe_catalog.jade +//- Crafting Guide - mod_pack.jade //- //- Copyright (c) 2014 by Redwood Labs //- All rights reserved. //- -.view__recipe_catalog +.view__mod_pack h2 img(src="/images/bookshelf.png") p Recipe Catalog diff --git a/test/crafting_plan.test.coffee b/test/crafting_plan.test.coffee index 232032866..f8aaf35d2 100644 --- a/test/crafting_plan.test.coffee +++ b/test/crafting_plan.test.coffee @@ -5,7 +5,7 @@ # All rights reserved. ### -RecipeCatalog = require '../src/scripts/models/recipe_catalog' +ModPack = require '../src/scripts/models/mod_pack' CraftingPlan = require '../src/scripts/models/crafting_plan' ######################################################################################################################## @@ -17,7 +17,7 @@ catalog = plan = null describe 'CraftingPlan', -> beforeEach -> - catalog = new RecipeCatalog + catalog = new ModPack catalog.loadBookData { version: 1 mod_name: 'Minecraft'