Commit d7ee8e7e authored by Rafal's avatar Rafal

add project

parent 24635c2c
...@@ -5,7 +5,7 @@ from django.conf.urls.static import static ...@@ -5,7 +5,7 @@ from django.conf.urls.static import static
from BeHub import settings from BeHub import settings
from Hub import views as hub_views from Hub import views as hub_views
from Hub.views import login_page, main_page, dashboard, maps from Hub.views import login_page, main_page, dashboard, project
router = routers.DefaultRouter() router = routers.DefaultRouter()
router.register(r'beacons', hub_views.BeaconViewSet) router.register(r'beacons', hub_views.BeaconViewSet)
...@@ -20,7 +20,7 @@ urlpatterns = patterns('', ...@@ -20,7 +20,7 @@ urlpatterns = patterns('',
url(r'^$', main_page), url(r'^$', main_page),
url(r'^login/$', login_page), url(r'^login/$', login_page),
url(r'^dashboard/$', dashboard), url(r'^dashboard/$', dashboard),
url(r'^maps/$', maps), url(r'^project/(?P<project_id>\w+)/$', project),
url(r'^api/', include(router.urls)), url(r'^api/', include(router.urls)),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^api/uuid/(?P<pk>[0-9]+)/$', hub_views.UuidBeaconViewSet.as_view()), url(r'^api/uuid/(?P<pk>[0-9]+)/$', hub_views.UuidBeaconViewSet.as_view()),
......
...@@ -48,4 +48,15 @@ body {padding-top:50px;} ...@@ -48,4 +48,15 @@ body {padding-top:50px;}
box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.16), 0 2px 5px 0 rgba(0, 0, 0, 0.12); box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.16), 0 2px 5px 0 rgba(0, 0, 0, 0.12);
color: #fff; color: #fff;
transition: all 0.5s ease 0s; transition: all 0.5s ease 0s;
} }
\ No newline at end of file
.opacity {
opacity: 0.5;
filter: alpha(opacity=100);
}
.opacity:hover {
opacity: 1;
filter: alpha(opacity=50);
}
\ No newline at end of file
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<a href="/project/{{ project.id }}"> <a href="/project/{{ project.id }}">
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 col-lg-offset-3" > <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 col-lg-offset-3" >
<div class="box"> <div class="box opacity" >
<div class="box-icon"> <div class="box-icon">
<span class="fa fa-4x fa-html5"></span> <span class="fa fa-4x fa-html5"></span>
</div> </div>
...@@ -19,6 +19,22 @@ ...@@ -19,6 +19,22 @@
</div> </div>
</div> </div>
</div> </div>
</a>
<a href="/project/{{ project.id }}">
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 col-lg-offset-3" >
<div class="box opacity" >
<div class="box-icon">
<span class="fa fa-4x fa-html5"></span>
</div>
<div class="info">
<h4 class="text-center">Gra miejska</h4>
<p>Gra miejska Juwenalia 2015</p>
</div>
</div>
</div>
</a>
</div> </div>
</div> </div>
......
{% extends 'user_panel/default/base.html' %}
{% block content %}
<div class="container">
Projekt detail
</div>
{% endblock content %}
\ No newline at end of file
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="/">Projekty</a></li>
<li><a href="/maps">Mapa beaconow</a></li>
<li><a href="/logout">Logout</a></li> <li><a href="/logout">Logout</a></li>
</ul> </ul>
......
...@@ -66,7 +66,6 @@ class UuidBeaconViewSet(APIView): ...@@ -66,7 +66,6 @@ class UuidBeaconViewSet(APIView):
except ObjectDoesNotExist: except ObjectDoesNotExist:
return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"This category is not exist"}) return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"This category is not exist"})
try: try:
site = beacon_manager.sites.get(category=category) site = beacon_manager.sites.get(category=category)
except ObjectDoesNotExist: except ObjectDoesNotExist:
return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Any link do not have this category"}) return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Any link do not have this category"})
...@@ -116,6 +115,6 @@ def dashboard(request): ...@@ -116,6 +115,6 @@ def dashboard(request):
context = RequestContext(request) context = RequestContext(request)
return render_to_response('user_panel/content/dashboard.html', {}, context) return render_to_response('user_panel/content/dashboard.html', {}, context)
def maps(request): def project(request, project_id):
context = RequestContext(request) context = RequestContext(request)
return render_to_response('user_panel/content/maps.html', {}, context) return render_to_response('user_panel/content/project.html', {}, context)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment