gergely/gergelypolonkai-web-symfony2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of localhost:gergelypolonkaiweb

Browse Source
This commit is contained in:
Polonkai Gergely 2012-11-28 11:45:33 +01:00
commit eba5c4f6c0
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Resources/views/base.html.twig
View File

@ -1,13 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>{% block title %}Welcome!{% endblock %}</title>
{% block stylesheets %}{% endblock %}
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
</head>
<body>
{% block body %}{% endblock %}
{% block javascripts %}{% endblock %}
</body>
</html>

26
src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css
View File

@ -71,21 +71,28 @@ body {
} }
#menu { #menu {
background-color: #b5b5b5; background-color: #f18137;
height: 39px; height: 39px;
margin-top: 15px;
}
#tagcloud-button {
float: left;
padding-top: 2px;
padding-left: 6px;
cursor: pointer;
} }
#menu ul { #menu ul {
margin: 8px; margin: 8px;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
text-align: right; float: right;
vertical-align: middle;
} }
#menu ul li { #menu ul li {
float: right; float: right;
margin-top: 10px; margin-top: 1px;
margin-bottom: 10px; margin-bottom: 10px;
margin-left: 1em; margin-left: 1em;
height: 30px; height: 30px;
@ -186,6 +193,17 @@ dd p {
text-align: right; text-align: right;
} }
#tag-cloud {
position: absolute;
width: 600px;
padding: 8px;
border: 1px solid black;
background-color: #303030;
margin-left: 5px;
margin-top: 2px;
display: none;
}
#tag-cloud a { #tag-cloud a {
color: #b3b3b3; color: #b3b3b3;
text-decoration: none; text-decoration: none;

BIN
src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

21
src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig
View File

@ -34,14 +34,8 @@
</div> </div>
</div> </div>
<div id="content-padding"></div> <div id="content-padding"></div>
{% if tagCloud|length > 0 %}
<div id="tag-cloud">
{% for cloudItem in tagCloud %}
<a href="{{ path('GergelyPolonkaiFrontBundle_blogTagList', { name: cloudItem.name }) }}" class="size{{ cloudItem.size }}">{{ cloudItem.name }}</a>{% if not loop.last %} | {% endif %}
{% endfor %}
</div>
{% endif %}
<div id="menu"> <div id="menu">
<div id="tagcloud-button"><img alt="" src="{{ asset('bundles/gergelypolonkaifront/images/tagcloud.png') }}" /></div>
<ul> <ul>
<li {% if currentMenu == 'resume' %} class="active"{% endif %}><a href="{{ path('GergelyPolonkaiFrontBundle_resume', { _format: 'html' }) }}">Resume</a></li> <li {% if currentMenu == 'resume' %} class="active"{% endif %}><a href="{{ path('GergelyPolonkaiFrontBundle_resume', { _format: 'html' }) }}">Resume</a></li>
<li {% if currentMenu == 'blog' %} class="active"{% endif %}><a href="{{ path('GergelyPolonkaiFrontBundle_blogListing') }}">Blog</a></li> <li {% if currentMenu == 'blog' %} class="active"{% endif %}><a href="{{ path('GergelyPolonkaiFrontBundle_blogListing') }}">Blog</a></li>
@ -49,6 +43,13 @@
</ul> </ul>
<br class="clear" /> <br class="clear" />
</div> </div>
{% if tagCloud|length > 0 %}
<div id="tag-cloud">
{% for cloudItem in tagCloud %}
<a href="{{ path('GergelyPolonkaiFrontBundle_blogTagList', { name: cloudItem.name }) }}" class="size{{ cloudItem.size }}">{{ cloudItem.name }}</a>{% if not loop.last %} | {% endif %}
{% endfor %}
</div>
{% endif %}
<div id="content"> <div id="content">
{% block content %}{% endblock content %} {% block content %}{% endblock content %}
</div> </div>
@ -60,7 +61,13 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() {
$('.at-obfuscation').html('@'); $('.at-obfuscation').html('@');
$('#tagcloud-button').click(function() {
$('#tag-cloud').toggle('slow');
});
});
</script> </script>
</body> </body>
</html> </html>