Permalink
Browse files

Moved all templates to 'startupapi' namespace

  • Loading branch information...
sergeychernyshev committed Nov 20, 2014
1 parent c695085 commit 46f3ee4bee2140948df3d05a80f3b2b202e1297c
Showing with 92 additions and 89 deletions.
  1. +1 −1 badges.php
  2. +6 −3 classes/StartupAPI.php
  3. +1 −1 edit.php
  4. +1 −1 edit_account.php
  5. +1 −1 invitations.php
  6. +1 −1 login.php
  7. +1 −1 maillist.php
  8. +1 −1 manage_account.php
  9. +1 −1 modules/email/login.php
  10. +1 −1 modules/external_payment/external_page.php
  11. +1 −1 modules/usernamepass/forgotpassword.php
  12. +1 −1 modules/usernamepass/passwordreset.php
  13. +1 −1 register.php
  14. +1 −1 send_email_verification_code.php
  15. +1 −1 show_badge.php
  16. +1 −1 subscription_details.php
  17. +2 −2 themes/awesome/templates/account/edit_account.html.twig
  18. +1 −1 themes/awesome/templates/account/manage_account.html.twig
  19. +2 −2 themes/awesome/templates/account/subscription_details.html.twig
  20. +2 −2 themes/awesome/templates/account/transaction_log.html.twig
  21. +1 −1 themes/awesome/templates/badges.html.twig
  22. +2 −2 themes/awesome/templates/edit.html.twig
  23. +1 −1 themes/awesome/templates/invitations.html.twig
  24. +1 −1 themes/awesome/templates/login.html.twig
  25. +1 −1 themes/awesome/templates/maillist.html.twig
  26. +1 −1 themes/awesome/templates/modules/email/edit_user_form.html.twig
  27. +2 −2 themes/awesome/templates/modules/email/login.html.twig
  28. +1 −1 themes/awesome/templates/modules/external_payment/external_page.html.twig
  29. +1 −1 themes/awesome/templates/modules/usernamepass/edit_user_form.html.twig
  30. +2 −2 themes/awesome/templates/modules/usernamepass/forgotpassword.html.twig
  31. +2 −2 themes/awesome/templates/modules/usernamepass/passwordreset.html.twig
  32. +2 −2 themes/awesome/templates/page.html.twig
  33. +1 −1 themes/awesome/templates/page_with_sidebar.html.twig
  34. +2 −2 themes/awesome/templates/plan/plans.html.twig
  35. +1 −1 themes/awesome/templates/plan/select_payment_method.html.twig
  36. +2 −2 themes/awesome/templates/register.html.twig
  37. +1 −1 themes/awesome/templates/show_badge.html.twig
  38. +1 −1 themes/awesome/templates/verify_email.html.twig
  39. +2 −2 themes/classic/templates/account/edit_account.html.twig
  40. +1 −1 themes/classic/templates/account/manage_account.html.twig
  41. +2 −2 themes/classic/templates/account/subscription_details.html.twig
  42. +2 −2 themes/classic/templates/account/transaction_log.html.twig
  43. +1 −1 themes/classic/templates/badges.html.twig
  44. +2 −2 themes/classic/templates/edit.html.twig
  45. +2 −2 themes/classic/templates/invitations.html.twig
  46. +1 −1 themes/classic/templates/login.html.twig
  47. +1 −1 themes/classic/templates/maillist.html.twig
  48. +1 −1 themes/classic/templates/modules/email/edit_user_form.html.twig
  49. +2 −2 themes/classic/templates/modules/email/login.html.twig
  50. +2 −2 themes/classic/templates/modules/external_payment/external_page.html.twig
  51. +1 −1 themes/classic/templates/modules/usernamepass/edit_user_form.html.twig
  52. +2 −2 themes/classic/templates/modules/usernamepass/forgotpassword.html.twig
  53. +2 −2 themes/classic/templates/modules/usernamepass/passwordreset.html.twig
  54. +2 −2 themes/classic/templates/page.html.twig
  55. +1 −1 themes/classic/templates/page_with_sidebar.html.twig
  56. +2 −2 themes/classic/templates/plan/plans.html.twig
  57. +2 −2 themes/classic/templates/plan/select_payment_method.html.twig
  58. +2 −2 themes/classic/templates/register.html.twig
  59. +1 −1 themes/classic/templates/send_email_verification_code.html.twig
  60. +1 −1 themes/classic/templates/show_badge.html.twig
  61. +2 −2 themes/classic/templates/verify_email.html.twig
  62. +1 −1 transaction_log.php
  63. +1 −1 verify_email.php
View
@@ -40,4 +40,4 @@
$template_info['badges'][] = $badge_info;
}
StartupAPI::$template->display('badges.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/badges.html.twig', $template_info);
View
@@ -73,7 +73,7 @@ static function head() {
* @return string HTML to be output withing <head> tag on the page
*/
static function renderHeadHTML() {
return StartupAPI::$template->render('head_tag.html.twig', self::getTemplateInfo());
return StartupAPI::$template->render('@startupapi/head_tag.html.twig', self::getTemplateInfo());
}
/**
@@ -93,7 +93,7 @@ static function renderPowerStrip($nav_pills = null, $show_navbar = null, $invert
))
);
return StartupAPI::$template->render('power_strip.html.twig', $template_info);
return StartupAPI::$template->render('@startupapi/power_strip.html.twig', $template_info);
}
/**
@@ -167,7 +167,10 @@ static function _init() {
}
// Configuring the templating
$loader = new Twig_Loader_Filesystem($template_folders);
$loader = new Twig_Loader_Filesystem(__DIR__);
foreach ($template_folders as $folder) {
$loader->addPath($folder, 'startupapi');
}
$loader->addPath(dirname(__DIR__) . '/admin/templates', 'admin');
self::$template = new Twig_Environment($loader, UserConfig::$twig_options);
View
@@ -115,4 +115,4 @@
}
}
StartupAPI::$template->display('edit.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/edit.html.twig', $template_info);
View
@@ -36,4 +36,4 @@
$template_info['PAGE']['SECTION'] = 'account';
$template_info['account_name'] = $account->getName();
StartupAPI::$template->display('account/edit_account.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/account/edit_account.html.twig', $template_info);
View
@@ -107,4 +107,4 @@
);
}
StartupAPI::$template->display('invitations.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/invitations.html.twig', $template_info);
View
@@ -68,4 +68,4 @@
$template_info['login_failed'][$id] = TRUE;
}
StartupAPI::$template->display('login.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/login.html.twig', $template_info);
View
@@ -15,4 +15,4 @@
$template_info['maillist_html'] = file_get_contents(UserConfig::$maillist);
}
StartupAPI::$template->display('maillist.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/maillist.html.twig', $template_info);
View
@@ -95,4 +95,4 @@
$template_info['PAGE']['SECTION'] = 'account';
StartupAPI::$template->display('account/manage_account.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/account/manage_account.html.twig', $template_info);
View
@@ -45,4 +45,4 @@
#var_export($template_info['errors']); exit;
StartupAPI::$template->display('modules/email/login.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/email/login.html.twig', $template_info);
@@ -26,4 +26,4 @@
$template_info['engine']['logo'] = $engine->getLogo();
}
StartupAPI::$template->display('modules/external_payment/external_page.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/external_payment/external_page.html.twig', $template_info);
@@ -48,4 +48,4 @@
$template_info['slug'] = 'usernamepass';
StartupAPI::$template->display('modules/usernamepass/forgotpassword.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/usernamepass/forgotpassword.html.twig', $template_info);
@@ -38,4 +38,4 @@
$template_info['slug'] = 'usernamepass';
StartupAPI::$template->display('modules/usernamepass/passwordreset.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/usernamepass/passwordreset.html.twig', $template_info);
View
@@ -111,4 +111,4 @@
$template_info['errors'] = $errors;
StartupAPI::$template->display('register.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/register.html.twig', $template_info);
@@ -17,4 +17,4 @@
$template_info['email'] = $email;
$template_info['PAGE']['SECTION'] = 'profile_info';
StartupAPI::$template->display('send_email_verification_code.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/send_email_verification_code.html.twig', $template_info);
View
@@ -40,4 +40,4 @@
$template_info['description'] = $badge->getDescription();
$template_info['call_to_action'] = $badge->getCallToAction($badge_level);
StartupAPI::$template->display('show_badge.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/show_badge.html.twig', $template_info);
View
@@ -107,4 +107,4 @@
$template_info['PAGE']['SECTION'] = 'subscription_details';
$template_info['account_name'] = $account->getName();
StartupAPI::$template->display('account/subscription_details.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/account/subscription_details.html.twig', $template_info);
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="page-header">
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<script>
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="page-header">
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="page-header">
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<div class="page-header">
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
{% if not current_module %}
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<script>
STARTUPAPI.showMessages({
@@ -1,4 +1,4 @@
{% extends 'page.html.twig' %}
{% extends '@startupapi/page.html.twig' %}
{% block content %}
<div class="container-fluid">
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<div class="page-header">
@@ -1,4 +1,4 @@
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
<div class="page-header">
<h1>Update your name and email</h1>
</div>
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid">
@@ -1,4 +1,4 @@
{% extends 'page.html.twig' %}
{% extends '@startupapi/page.html.twig' %}
{% block content %}
<div class="container-fluid">
@@ -1,4 +1,4 @@
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
<script>
STARTUPAPI.showMessages({
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid">
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid">
@@ -3,10 +3,10 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>{% block title %}Users - {{UserConfig.appName}}{% endblock %}</title>
{% include 'head_tag.html.twig' %}
{% include '@startupapi/head_tag.html.twig' %}
</head>
<body>
{% include 'power_strip.html.twig' %}
{% include '@startupapi/power_strip.html.twig' %}
<!-- header ends -->
{% block base %}
@@ -1,4 +1,4 @@
{% extends 'page.html.twig' %}
{% extends '@startupapi/page.html.twig' %}
{% block base %}
<div class="container-fluid">
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
{% for msg in message %}
@@ -1,5 +1,5 @@
{% extends AUTH.current_user.is_logged_in ? 'page_with_sidebar.html.twig' : 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
{% for msg in message %}
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid">
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<div class="page-header">
@@ -1,5 +1,5 @@
{% extends AUTH.current_user.is_logged_in ? 'page_with_sidebar.html.twig' : 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
{% if not AUTH.current_user.is_logged_in %}
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<legend>Edit Account Information / <b>{{account_name}}</b></legend>
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<script>
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<legend>
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<legend>
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<div>
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div>
@@ -1,5 +1,5 @@
{% extends 'page_with_sidebar.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<script>
@@ -1,4 +1,4 @@
{% extends 'page.html.twig' %}
{% extends '@startupapi/page.html.twig' %}
{% block content %}
<div class="container-fluid">
@@ -1,4 +1,4 @@
{% extends 'page_with_sidebar.html.twig' %}
{% extends '@startupapi/page_with_sidebar.html.twig' %}
{% block content %}
<legend>Email preferences</legend>
@@ -1,4 +1,4 @@
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
<form class="form-horizontal" action="{{action}}" method="POST">
<fieldset>
<legend>Update your name and email</legend>
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid">
@@ -1,5 +1,5 @@
{% extends 'page.html.twig' %}
{% import 'error_messages.html.twig' as ERR %}
{% extends '@startupapi/page.html.twig' %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
{% block content %}
<div class="container-fluid" style="margin-top: 1em">
@@ -1,4 +1,4 @@
{% import 'error_messages.html.twig' as ERR %}
{% import '@startupapi/error_messages.html.twig' as ERR %}
<form class="form-horizontal" action="{{action}}" method="POST">
<fieldset>
<legend>Update your username and password</legend>
Oops, something went wrong.

0 comments on commit 46f3ee4

Please sign in to comment.