Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
BeHub-web
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dominik Rosiek
BeHub-web
Commits
43cd4bc9
Commit
43cd4bc9
authored
Nov 22, 2015
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reapair code
parent
c963c53b
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
51 additions
and
5 deletions
+51
-5
beacons.css
BeHub/Hub/static/css/beacons.css
+3
-0
map.js
BeHub/Hub/static/js/map.js
+1
-1
base.html
BeHub/Hub/templates/page/default/base.html
+1
-0
beacon_detail.html
BeHub/Hub/templates/user_panel/content/beacon_detail.html
+14
-0
beacons.html
BeHub/Hub/templates/user_panel/content/beacons.html
+20
-0
project.html
BeHub/Hub/templates/user_panel/content/project.html
+2
-2
base.html
BeHub/Hub/templates/user_panel/default/base.html
+1
-1
views.py
BeHub/Hub/views.py
+9
-1
No files found.
BeHub/Hub/static/css/beacons.css
0 → 100644
View file @
43cd4bc9
.borderless
tbody
tr
td
,
.borderless
tbody
tr
th
,
.borderless
thead
tr
th
{
border
:
none
;
}
\ No newline at end of file
BeHub/Hub/static/js/map.js
View file @
43cd4bc9
...
@@ -8,7 +8,7 @@ var Map = (function(){
...
@@ -8,7 +8,7 @@ var Map = (function(){
Map
.
prototype
.
init
=
function
(){
Map
.
prototype
.
init
=
function
(){
var
self
=
this
;
var
self
=
this
;
this
.
myLatLng
=
{
lat
:
50.049765
,
lng
:
19.946762
};
this
.
myLatLng
=
{
lat
:
50.049765
,
lng
:
19.946762
};
this
.
map
=
new
google
.
maps
.
Map
(
document
.
getElementById
(
'
map
'
),
{
this
.
map
=
new
google
.
maps
.
Map
(
document
.
getElementById
(
'
gmaps
'
),
{
zoom
:
4
,
zoom
:
4
,
center
:
self
.
myLatLng
center
:
self
.
myLatLng
});
});
...
...
BeHub/Hub/templates/page/default/base.html
View file @
43cd4bc9
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/login.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/login.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/footer.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/footer.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/the-big-picture.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/the-big-picture.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/beacons.css' %}"
/>
<title>
Free Beacons
</title>
<title>
Free Beacons
</title>
</head>
</head>
...
...
BeHub/Hub/templates/user_panel/content/beacon_detail.html
0 → 100644
View file @
43cd4bc9
{{ project_data }}
{{ beacon }}
<div
class=
"box"
>
<table
class=
"table borderless"
>
<tbody>
<tr>
<td
class=
"col-md-2"
>
{{ beacon.name }}
</td>
<td>
Doe
</td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
BeHub/Hub/templates/user_panel/content/beacons.html
0 → 100644
View file @
43cd4bc9
<div
class=
"container"
>
<table
class=
"table borderless"
>
<thead>
<tr>
<th
class=
"col-md-2"
>
Beacon
</th>
<th>
Linki
</th>
</tr>
</thead>
</table>
{% for beacon in project_data.beacons %}
{% include 'user_panel/content/beacon_detail.html' %}
{% endfor %}
</div>
\ No newline at end of file
BeHub/Hub/templates/user_panel/content/project.html
View file @
43cd4bc9
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
<div
class=
"tab-content"
>
<div
class=
"tab-content"
>
<div
id=
"beacons"
class=
"tab-pane fade in active"
>
<div
id=
"beacons"
class=
"tab-pane fade in active"
>
<h3>
HOME
</h3>
<p>
Some content.
</p>
{% include 'user_panel/content/beacons.html' %}
</div>
</div>
<div
id=
"map"
class=
"tab-pane fade"
>
<div
id=
"map"
class=
"tab-pane fade"
>
{% include 'user_panel/content/maps.html' %}
{% include 'user_panel/content/maps.html' %}
...
...
BeHub/Hub/templates/user_panel/default/base.html
View file @
43cd4bc9
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/login.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/login.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/footer.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/footer.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/font-awesome.min.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/font-awesome.min.css' %}"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"{% static 'css/beacons.css' %}"
/>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script
src=
"https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"
></script>
<script
src=
"https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"
></script>
...
@@ -30,7 +31,6 @@
...
@@ -30,7 +31,6 @@
</div>
</div>
{% include 'user_panel/default/footer.html' %}
{% include 'user_panel/default/footer.html' %}
<script
src=
"{% static 'js/hobby_detail.js' %}"
></script>
<script
src=
"{% static 'js/map.js' %}"
></script>
<script
src=
"{% static 'js/map.js' %}"
></script>
<script
src=
"{% static 'js/project_detail.js' %}"
></script>
<script
src=
"{% static 'js/project_detail.js' %}"
></script>
<script
src=
"{% static 'js/bootstrap.js' %}"
></script>
<script
src=
"{% static 'js/bootstrap.js' %}"
></script>
...
...
BeHub/Hub/views.py
View file @
43cd4bc9
...
@@ -125,4 +125,12 @@ def dashboard(request):
...
@@ -125,4 +125,12 @@ def dashboard(request):
def
project
(
request
,
project_id
):
def
project
(
request
,
project_id
):
context
=
RequestContext
(
request
)
context
=
RequestContext
(
request
)
return
render_to_response
(
'user_panel/content/project.html'
,
{},
context
)
data
=
{}
user_project
=
UserProject
.
objects
.
get
(
id
=
project_id
)
user_project_serializer
=
UserProjectSerializer
(
user_project
,
context
=
{
'request'
:
request
})
beacons_serializer
=
BeaconSerializer
(
user_project
.
beacons
,
many
=
True
,
context
=
{
'request'
:
request
})
data
[
'project_data'
]
=
user_project_serializer
.
data
data
[
'project_data'
][
'beacons'
]
=
beacons_serializer
.
data
return
render_to_response
(
'user_panel/content/project.html'
,
data
,
context
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment