Skip to content

Commit

Permalink
leverage new silex before filter and twig globals
Browse files Browse the repository at this point in the history
  • Loading branch information
igorw committed Jan 14, 2011
1 parent f93b0df commit 7c0d166
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 30 deletions.
3 changes: 1 addition & 2 deletions .gitignore
@@ -1,6 +1,5 @@
config.yml
silex.phar
data/*
cache/twig/*.php
cache
.DS_Store
.htaccess
36 changes: 14 additions & 22 deletions app.php
Expand Up @@ -19,6 +19,18 @@

$app = $container->get('framework');

$app->before(function() use ($app, $container) {
$request = $app->getRequest();
$twig = $container->get('twig');

// set up some template globals
$twig->addGlobal('footer', $container->getParameter('app.footer'));
$twig->addGlobal('base_path', $request->getBasePath());
$twig->addGlobal('index_url', $request->getBasePath().'/');
$twig->addGlobal('create_url', $request->getBasePath().'/create');
$twig->addGlobal('languages', getLanguages());
});

$app->get('/', function() use ($app, $container) {
$request = $app->getRequest();
$twig = $container->get('twig');
Expand All @@ -33,11 +45,7 @@
$template = $twig->loadTemplate('index.html');

return $template->render(array(
'base_path' => $request->getBasePath(),
'create_url' => $request->getBasePath().'/create',
'languages' => getLanguages(),
'paste' => $parent,
'footer' => $container->getParameter('app.footer'),
));
});

Expand All @@ -61,25 +69,19 @@
'createdAt' => new MongoDate(),
);

$languages = getLanguages();

if ('' === trim($paste['content'])) {
$errorMsg = 'you must enter some content';

$template = $twig->loadTemplate('index.html');

return $template->render(array(
'base_path' => $request->getBasePath(),
'create_url' => $request->getBasePath().'/create',
'languages' => $languages,
'error_msg' => $errorMsg,
'paste' => $paste,
'footer' => $container->getParameter('app.footer'),
));
}

$language = (string) $request->get('language', '');
if (in_array($language, $languages)) {
if (in_array($language, getLanguages())) {
$paste['language'] = $language;
}

Expand All @@ -105,11 +107,8 @@
$template = $twig->loadTemplate('view.html');

return $template->render(array(
'base_path' => $request->getBasePath(),
'index_url' => $request->getBasePath().'/',
'copy_url' => $request->getBasePath().'/?parent='.$paste['_id'],
'paste' => $paste,
'footer' => $container->getParameter('app.footer'),
));
});

Expand All @@ -119,11 +118,7 @@

$template = $twig->loadTemplate('about.html');

return $template->render(array(
'base_path' => $request->getBasePath(),
'index_url' => $request->getBasePath().'/',
'footer' => $container->getParameter('app.footer'),
));
return $template->render(array());
});

$app->error(function(Exception $e) use ($app, $container) {
Expand All @@ -138,10 +133,7 @@
$template = $twig->loadTemplate('error.html');

return new Response($template->render(array(
'base_path' => $request->getBasePath(),
'index_url' => $request->getBasePath().'/',
'message' => $e->getMessage(),
'footer' => $container->getParameter('app.footer'),
)), $code);
});

Expand Down
2 changes: 1 addition & 1 deletion views/error.html
Expand Up @@ -8,6 +8,6 @@ <h2>error</h2>

<p>{{ message|e }}</p>

<span><a href="{{ index_url|e }}">new paste</a></span>
<span><a href="{{ index_url }}">new paste</a></span>

{% endblock %}
8 changes: 4 additions & 4 deletions views/index.html
Expand Up @@ -5,18 +5,18 @@
<h1>trashbin</h1>
<p>simple pastebin for pasting pastes.</p>
{% if error_msg %}
<p class="error_msg">&sim; {{ error_msg|e }}</p>
<p class="error_msg">&sim; {{ error_msg }}</p>
{% endif %}
<form action="{{ create_url|e }}" method="post">
<form action="{{ create_url }}" method="post">
<select name="language">
<option value="">none</option>
{% for language in languages %}
<option{% if paste and paste.language == language %} selected="selected"{% endif %}>
{{ language|e }}
{{ language }}
</option>
{% endfor %}
</select>
<textarea name="content">{{ paste.content|e }}</textarea>
<textarea name="content">{{ paste.content }}</textarea>
<input type="submit" name="submit" value="trash it!" />
</form>

Expand Down
2 changes: 1 addition & 1 deletion views/layout.html
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
{% block body %}{% endblock %}
<div id="footer">{{ footer }}</div>
<div id="footer">{{ footer|raw }}</div>
</body>
</html>

0 comments on commit 7c0d166

Please sign in to comment.