more sample data, more work on the css

master
Tezza 2015-02-23 13:42:38 +01:00
parent e5394fceca
commit f6d1df3277
5 changed files with 81 additions and 27 deletions

View File

@ -13,8 +13,10 @@
true
);
$Level2[ 'open' ] = $spaceAPI[ 'state' ][ 'open' ];
$Level2[ 'people' ] = $spaceAPI[ 'sensors' ][ 'people_now_present' ][ 0 ][ 'value' ];
$Level2[ 'open' ] = $spaceAPI[ 'state' ][ 'open' ];
$Level2[ 'people' ] = $spaceAPI[ 'sensors' ][ 'people_now_present' ][ 0 ][ 'value' ];
$Level2[ 'address' ] = $spaceAPI[ 'location' ][ 'address' ];
$Level2[ 'phone' ] = $spaceAPI[ 'contact' ][ 'phone' ];
return $Level2;

View File

@ -16,7 +16,7 @@
return $app['twig']->render(
'level2.twig',
array(
'level2State' => Level2::getStatus()
'level2' => Level2::getStatus()
)
);

View File

@ -43,8 +43,8 @@
<li><a href="#contact">Contact</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if level2State.open %}
<li class="status status-open"><a>Open &middot; {{ level2State.people }} hackers inside</a></li>
{% if level2.open %}
<li class="status status-open"><a>Open &middot; {{ level2.people }} hackers inside</a></li>
{% else %}
<li class="status status-closed"><a>Closed</a></li>
{% endif %}
@ -55,15 +55,21 @@
<div class="container">
<div class="content">
{% block content %}
{% endblock content %}
{% block container %}
{% endblock container %}
<div class="row footer">
<div class="col-sm-4">
{{ level2.address }}
</div>
<div class="col-sm-4">
T: <a href="tel:{{ level2.phone }}">{{ level2.phone }}</a>
</div>
<div class="col-sm-4">
{{ level2.address }}
</div>
</div>
<footer>test</footer>
</div> <!-- /container -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>

View File

@ -1,12 +1,42 @@
{% extends "base.twig" %}
{% block content %}
{% block container %}
<!-- Example row of columns -->
<div class="row">
<div class="col-sm-7 well">
<div class="col-sm-4">
<h2>Events</h2>
</div>
<div class="col-sm-8 event well">
<div class="col-sm-4">
<img src="https://www.hackerspace.lu/wp-content/uploads/2015/01/cfbtncrop.jpg" />
</div>
<div class="col-sm-8">
<h2>Hello from Tezza :)</h2>
<h4>Engineering-desks</h4>
<p>We're open every monday ;)</p>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<h2>Hello from Tezza :)</h2>
</div>
<div class="col-sm-8 event well">
<div class="col-sm-4">
<img src="https://www.hackerspace.lu/wp-content/uploads/2015/01/cfbtncrop.jpg" />
</div>
<div class="col-sm-8">
<h2>Hello from Tezza :)</h2>
<h4>Engineering-desks</h4>
<p>We're open every monday ;)</p>
</div>
</div>
</div>
{% endblock %}

View File

@ -18,24 +18,23 @@ body {
height: 100%;
}
.well {
padding: 0.5rem 1rem;
}
.container {
height: 100%;
}
.content{
padding: 0.5rem;
border: none;
background: rgba( 255, 255, 255, 0.7 );
border-radius: 0.4rem 0.4rem 0px 0px;
min-height: 100%;
box-sizing: border-box;
margin-bottom: -50px;
padding-bottom: 50px;
border-radius: 0.4rem;
}
footer {
.footer {
margin-top: 2rem;
color: #fff;
background-color: #4B4949;
background: rgba( 75, 73, 73, 0.8 );
height: 50px;
border-radius: 0.4rem;
padding: 0.5rem;
}
.footer a {
color: rgba(127, 213, 225, 1);
}
/**
@ -71,4 +70,21 @@ footer {
}
/**
* END - NAVBAR
*/
*/
h2, h3, h4 {
text-shadow: 1px 0px 6px rgba(255, 255, 255, 0.7);
}
.event h2, .event h3, .event h4, .event p {
margin: 0;
}
.event h4 {
color: #777;
}
img {
max-width: 100%;
border-radius: 0.4rem;
}