The big one. Templates reorganized.

Author: alexweissman

CHANGELOG.md

@@ -9,6 +9,7 @@
 - Eliminate the `root` theme Sprinkle.  Custom styling for the root user is now handled with some Twig logic in the `admin` Sprinkle (#726)
 - Rename bundle.config.json -> asset-bundles.json (#726)
 - Reorganize assets (#726)
+- Heavily reorganize templates (#726)
 - Factor out "system" classes from core Sprinkle
 - Refactor overall application lifecycle; move main lifecycle into UserFrosting\System\UserFrosting
 - SprinkleManager now better focused on a single responsibility

app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/settings
  */

app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/forgot-password
  */

app/sprinkles/account/assets/userfrosting/js/pages/register.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/register
  */

app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/resend-verification
  */

app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target pages: account/set-password, account/reset-password
  */

app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js

@@ -2,7 +2,7 @@
  * Page-specific Javascript file.  Should generally be included as a separate asset bundle in your page template.
  * example: {{ assets.js('js/pages/sign-in-or-register') | raw }}
  *
- * This script depends on validation rules specified in components/page.js.twig.
+ * This script depends on validation rules specified in pages/partials/page.js.twig.
  *
  * Target page: account/sign-in
  */

app/sprinkles/account/locale/ar/messages.php

@@ -6,7 +6,7 @@
  * Modern Standard Arabic message token translations for the 'account' sprinkle
  *
  * @package UserFrosting
- * @link http://wwwuserfrostingcom/components/#i18n
+ * @link http://www.userfrosting.com/components/#i18n
  * @author Alex Weissman and Abdullah Seba
  *
  */

app/sprinkles/account/src/Controller/AccountController.php

@@ -252,7 +252,7 @@ public function forgotPassword($request, $response, $args)
      */
     public function getModalAccountTos($request, $response, $args)
     {
-        return $this->ci->view->render($response, 'components/modals/tos.html.twig');
+        return $this->ci->view->render($response, 'modals/tos.html.twig');
     }
 
     /**

…ponents/forms/settings-account.html.twig …mplates/forms/settings-account.html.twigapp/sprinkles/account/templates/components/forms/settings-account.html.twig renamed to app/sprinkles/account/templates/forms/settings-account.html.twig app/sprinkles/account/templates/components/forms/settings-account.html.twig renamed to app/sprinkles/account/templates/forms/settings-account.html.twig

@@ -3,7 +3,7 @@
         <h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
     </div>
     <div class="box-body">
-        {% include "components/csrf.html.twig" %}
+        {% include "forms/csrf.html.twig" %}
         <!-- Prevent browsers from trying to autofill the password field.  See http://stackoverflow.com/a/23234498/2970321 -->
         <input type="text" style="display:none">
         <input type="password" style="display:none">