updated templates & controllers for Craft

amacneil · Mar 12, 2013 · a553a9e · a553a9e
1 parent df41ccb
commit a553a9e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/CocktailRecipesPlugin.php b/CocktailRecipesPlugin.php
@@ -36,7 +36,7 @@ public function hookRegisterCpRoutes()
     {
         return array(
             'cocktailrecipes\/ingredients\/new' => 'cocktailrecipes/ingredients/_edit',
-            'cocktailrecipes\/ingredients\/(?P<recipeId>\d+)' => 'cocktailrecipes/ingredients/_edit',
+            'cocktailrecipes\/ingredients\/(?P<ingredientId>\d+)' => 'cocktailrecipes/ingredients/_edit',
         );
     }
 

diff --git a/controllers/CocktailRecipes_IngredientsController.php b/controllers/CocktailRecipes_IngredientsController.php
@@ -34,7 +34,7 @@ public function actionSaveIngredient()
         } else {
             craft()->userSession->setError(Craft::t("Couldn't save ingredient."));
 
-            return $this->renderRequestedTemplate(array('ingredient' => $model));
+            craft()->urlManager->setRouteVariables(array('ingredient' => $model));
         }
     }
 

diff --git a/templates/index.html b/templates/index.html
@@ -1,13 +1,9 @@
 {% extends "_layouts/cp" %}
 {% set centered = true %}
 
-{% set ingredients = blx.cocktailrecipes.getAllIngredients %}
+{% set ingredients = craft.cocktailrecipes.getAllIngredients %}
 {% set title = "Cocktail Ingredients"|t %}
 
-{% set header %}
-    <h1>{{ title }}</h1>
-{% endset %}
-
 {% set content %}
 
     {{ "hi there, test sentence!"|shake }}

diff --git a/templates/ingredients/_edit.html b/templates/ingredients/_edit.html
@@ -5,7 +5,7 @@
 {% if ingredientId is not defined %}{% set ingredientId = null %}{% endif %}
 {% if ingredient is not defined %}
     {% if ingredientId %}
-        {% set ingredient = blx.cocktailrecipes.getIngredientById(ingredientId) %}
+        {% set ingredient = craft.cocktailrecipes.getIngredientById(ingredientId) %}
         {% if not ingredient %}{% exit 404 %}{% endif %}
     {% else %}
         {% set ingredient = null %}
@@ -14,12 +14,9 @@
 
 {% set title = ingredient ? ingredient.name : "New Ingredient"|t %}
 
-{% set header %}
-    <h1>{{ title }}</h1>
-    <ul class="left">
-        <li><a href="{{ url('cocktailrecipes') }}" class="backbtn">{{ "Cocktail Ingredients"|t }}</a></li>
-    </ul>
-{% endset %}
+{% set crumbs = [
+    { label: "Cocktail Ingredients"|t, url: url('cocktailrecipes') }
+] %}
 
 {% set content %}