Skip to content
Snippets Groups Projects
Commit d4d81895 authored by tuhe's avatar tuhe
Browse files

updates

parent a67ab906
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 44 additions and 200 deletions
README.txt
+ 10
− 1
View file @ d4d81895
......@@ -2,3 +2,12 @@ postgres (win)
postgres / gummiand
port: 5432
kubusnet_media is user uploaded files
kubusnet_static is (development) static files
kubusnet_static_col is automatically generated using
> python manage.py collectstatics
> python manage.py createsuperuser
python manage.py check
dev/README.txt
+ 0
− 5
View file @ d4d81895
kubusnet_media is user uploaded files
kubusnet_static is (development) static files
kubusnet_static_col is automatically generated using
> python manage.py collectstatics
dev/dkbn2/dkbn2/__pycache__/settings.cpython-38.pyc
+ 0
− 0
View file @ d4d81895
No preview for this file type
dev/dkbn2/dkbn2/__pycache__/urls.cpython-38.pyc
+ 0
− 0
View file @ d4d81895
No preview for this file type
dev/dkbn2/dkbn2/admin.py 0 → 100644
+ 8
− 0
View file @ d4d81895
# @admin.register(Proxy)
# class LabelAdmin(admin.ModelAdmin):
# change_list_template = 'label_view.html'
# def changelist_view(self, request, extra_context=None):
# ...
# return render(request, "label_view.html", context)
\ No newline at end of file
dev/dkbn2/dkbn2/communication/__pycache__/views.cpython-38.pyc
+ 0
− 0
View file @ d4d81895
No preview for this file type
dev/dkbn2/dkbn2/communication/views.py
+ 2
− 2
View file @ d4d81895
......@@ -47,7 +47,7 @@ def communication_front(request):
tasks = task_in_project()[:10]
notepads = notepad_in_project()[:10]
return render_to_response("communication/communication_front.html", locals())
return render(request, "communication/communication_front.html", locals())
def communication_arena(request, arena):
arena = int(arena)
......@@ -66,7 +66,7 @@ def communication_arena(request, arena):
# get context
tasks = task_in_project().filter(meeting__arena=arena)
notepads = notepad_in_project().filter(task__meeting__arena=arena)
return render_to_response("communication/communication_arena.html", locals())
return render(request, "communication/communication_arena.html", locals())
def set_content_objects(comments):
......
dev/dkbn2/dkbn2/extra_admin_pages/__pycache__/__init__.cpython-36.pyc deleted 100644 → 0
+ 0
− 0
View file @ a67ab906
File deleted
dev/dkbn2/dkbn2/extra_admin_pages/__pycache__/admin.cpython-36.pyc deleted 100644 → 0
+ 0
− 0
View file @ a67ab906
File deleted
dev/dkbn2/dkbn2/kmap/__pycache__/admin.cpython-38.pyc 0 → 100644
+ 0
− 0
View file @ d4d81895
File added
dev/dkbn2/dkbn2/kmap/__pycache__/models.cpython-38.pyc 0 → 100644
+ 0
− 0
View file @ d4d81895
File added
dev/dkbn2/dkbn2/settings.py
+ 5
− 4
View file @ d4d81895
......@@ -123,6 +123,9 @@ ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = [
'project_admin_views.apps.ProjectadminviewsAppConfig',
'extra_admin_pages.apps.ExtraadminpagesAppConfig', # BEFPRE admin.
# 'admin_views', # Not working anymore.
'django.contrib.contenttypes',
'django.contrib.sites',
'django.contrib.admin',
......@@ -131,16 +134,14 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles', # this ends the standard...
'django_tables2',
# 'dkbn2.project.admin_views',
# 'dkbn2.extra_admin_pages',
'pages.apps.PagesAppConfig',
'userprofile.apps.UserprofileAppConfig',
'profile.apps.ProfileAppConfig',
'project.apps.ProjectAppConfig',
'threadedcomments.apps.ThreadedcommentsAppConfig',
# 'dkbn2.kmap',
'dkbn2.kmap',
'fileshare.apps.FileshareAppConfig',
# 'dkbn2.graph',
'dkbn2.graph',
'tinymce',
]
......
dev/dkbn2/dkbn2/templates/admin/index.html 0 → 100644
+ 8
− 0
View file @ d4d81895
{% extends "admin/index.html" %}
{% block sidebar %}
{{block.super}}
<div>
<h1>Extra links</h1>
<a href="{% url 'add_users' %}">Add users</a>
</div>
{% endblock %}
\ No newline at end of file
dev/dkbn2/dkbn2/templates/meeting/kubusmodel_partial.html
+ 6
− 6
View file @ d4d81895
......@@ -3,7 +3,7 @@
<table border="0" width="100%" align="right" valign="middle">
<tr>
<td height="75px" width="100px" {% ifequal active 2%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td height="75px" width="100px" {% if active == 2%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
<div style="float : right;">{% bar total_2 "44ee44" 100 %}</span></div>
&nbsp;
</td>
......@@ -20,23 +20,23 @@
</map>
{% endif %}
</td>
<td {% ifequal active 4%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td {% if active == 4%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
{% bar total_4 "ee4444" 100 %}&nbsp;
</td>
</tr>
<tr>
<td height="75px" width="100px" {% ifequal active 1%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td height="75px" width="100px" {% if active == 1%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
<div style="float : right;">{% bar total_1 "44ee44" 100 %}</div>&nbsp;
</td>
<td {% ifequal active 6%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td {% if active == 6%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
{% bar total_6 "ee4444" 100 %}&nbsp;
</td>
</tr>
<tr>
<td height="75px" width="100px" {% ifequal active 3%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td height="75px" width="100px" {% if active == 3%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
<div style="float : right;">{% bar total_3 "44ee44" 100 %}</div>&nbsp;
</td>
<td {% ifequal active 5%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<td {% if active == 5%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endif %}>
{% bar total_5 "ee4444" 100 %}&nbsp;
</td>
</tr>
......
dev/dkbn2/dkbn2/templates/meeting/kubusmodel_partial.html~ deleted 100644 → 0
+ 0
− 43
View file @ a67ab906
{% load extras %}
{% load formatting %}
<table border="0" width="100%" align="right" valign="middle">
<tr>
<td height="75px" width="100px" {% ifequal active 2%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<div style="float : right;">{% bar total_2 "44ee44" 100 %}</span></div>
&nbsp;
</td>
<td ROWSPAN="3" width="425px">
<img src="/media/images/meeting/meeting_model.png" usemap="#imgmap">
{% if not no_imagemap %}
<map id="imgmap" name="imgmap">
<area shape="rect" alt="Begin time-logging in region 2" title="Begin time-logging in region 2" coords="5,5,93,73" href="javascript:selectt(2);" />
<area shape="rect" alt="Begin time-logging in region 1" title="Begin time-logging in region 1" coords="3,76,94,147" href="javascript:selectt(1);" />
<area shape="rect" alt="Begin time-logging in region 3" title="Begin time-logging in region 3" coords="4,151,96,220" href="javascript:selectt(3);" />
<area shape="rect" alt="Begin time-logging in region 4" title="Begin time-logging in region 4" coords="329,2,421,72" href="javascript:selectt(4);" />
<area shape="rect" alt="Begin time-logging in region 6" title="Begin time-logging in region 6" coords="331,78,420,146" href="javascript:selectt(6);" />
<area shape="rect" alt="Begin time-logging in region 5" title="Begin time-logging in region 5" coords="331,152,421,221" href="javascript:selectt(5);" />
</map>
{% endif %}
</td>
<td {% ifequal active 4%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
{% bar total_4 "ee4444" 100 %}&nbsp;
</td>
</tr>
<tr>
<td height="75px" width="100px" {% ifequal active 1%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<div style="float : right;">{% bar total_1 "44ee44" 100 %}</div>&nbsp;
</td>
<td {% ifequal active 6%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
{% bar total_6 "ee4444" 100 %}&nbsp;
</td>
</tr>
<tr>
<td height="75px" width="100px" {% ifequal active 3%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
<div style="float : right;">{% bar total_3 "44ee44" 100 %}</div>&nbsp;
</td>
<td {% ifequal active 5%}style="background-color : whitesmoke; border-color: lightgray; border-style :solid; border-width:1px;"{%endifequal%}>
{% bar total_5 "ee4444" 100 %}&nbsp;
</td>
</tr>
</table>
\ No newline at end of file
dev/dkbn2/dkbn2/templates/meeting/log_items.html
+ 2
− 2
View file @ d4d81895
......@@ -81,7 +81,7 @@ Whenever green or red leader wish to lead the rules by using one of the 6 roles,
</b>
{% for item in mli %}
{% ifequal item.type 0 %}
{% if item.type == 0 %}
<div class="span-3"><b>Task idea</b></div>
<div class="span-14 last">{{ item.text }}</div>
{% else %}
......@@ -94,7 +94,7 @@ Whenever green or red leader wish to lead the rules by using one of the 6 roles,
</div>
</div>
{% endif %}
{% endifequal %}
{% endif %}
{% endfor %}
......
dev/dkbn2/dkbn2/templates/meeting/log_items.html~ deleted 100644 → 0
+ 0
− 116
View file @ a67ab906
{% load extras %}
{% load formatting %}
{% if usemap %}
</form>
<input type="hidden" name="type"/>
<script language="javascript">
function selectt(area){
document.forms[0].type.value = area;
document.forms[0].submit();
}
</script>
{% endif %}
<div class="span-17 last">
<h6>Instructions</h6>
This page is used for logging how the time at the meetings are spend on the different roles.
Whenever green or red leader wish to lead the rules by using one of the 6 roles, the appropriate circle should be clicked.
</div>
<div class="span-17 last">
<h6>Total meeting duration: {{total|timeuntil:basedate}}</h6>
<table border="1" width="100%" align="right" valign="middle">
<tr><td width="100px"><div style="float : right;">{% bar total_1 "44ee44" 100 %}</span></div></td>
<td ROWSPAN="3" width="425px">
<!--
<img src="ss56024.png" usemap="#ss56024" width="425" height="229" alt="click map" border="0" />
<map id="ss56024" name="ss56024">
<area shape="default" nohref alt="" />
</map>
-->
<img src="/media/images/meeting/meeting_model.png" usemap="{% if usemap %}#imgmap{% endif%}">
<map id="imgmap" name="imgmap">
<area shape="rect" alt="Begin time-logging in region 2" title="Begin time-logging in region 2" coords="5,5,93,73" href="javascript:selectt(2);" />
<area shape="rect" alt="Begin time-logging in region 1" title="Begin time-logging in region 1" coords="3,76,94,147" href="javascript:selectt(1);" />
<area shape="rect" alt="Begin time-logging in region 3" title="Begin time-logging in region 3" coords="4,151,96,220" href="javascript:selectt(3);" />
<area shape="rect" alt="Begin time-logging in region 4" title="Begin time-logging in region 4" coords="329,2,421,72" href="javascript:selectt(4);" />
<area shape="rect" alt="Begin time-logging in region 6" title="Begin time-logging in region 6" coords="331,78,420,146" href="javascript:selectt(6);" />
<area shape="rect" alt="Begin time-logging in region 5" title="Begin time-logging in region 5" coords="331,152,421,221" href="javascript:selectt(5);" />
<!--
<area shape="circle" alt="" title="" coords="192,27,21" href="javascript:selectt(4);" target="" />
<area shape="circle" alt="" title="" coords="193,83,21" href="javascript:selectt(5);" target="" />
<area shape="circle" alt="" title="" coords="192,140,21" href="javascript:selectt(6);" target="" />
<area shape="circle" alt="" title="" coords="23,27,21" href="javascript:selectt(1);" target="" />
<area shape="circle" alt="" title="" coords="22,84,21" href="javascript:selectt(2);" target="" />
<area shape="circle" alt="" title="" coords="22,140,21" href="javascript:selectt(3);" target="" />
-->
</map>
</td><td>{% bar total_4 "ee4444" 100 %}</td></tr>
<tr><td width="100px"><div style="float : right;">{% bar total_2 "44ee44" 100 %}</div></td> <td>{% bar total_6 "ee4444" 100 %}</td></tr>
<tr><td width="100px"><div style="float : right;">{% bar total_3 "44ee44" 100 %}</div></td> <td>{% bar total_5 "ee4444" 100 %}</td></tr>
</table>
</div>
<div class="span-17 last">
<div class="span-8 colborder">
<h6>Meeting Focus</h6>
{{meeting.meeting_focus|linebreaks}}
</div>
{% if usemap %}
<div class="span-8 last">
<h6>Write task idea:</h6>
<input type="text" name="text" value=" "/><input type="button" onClick="selectt(0);" value="Save">
</div>
{% endif %}
</div>
<div class="span-17 last">
<br>
<br>
<b>
<div class="span-17 last">
<div class="span-3">Duration</div>
<div class="span-6">Green leader</div>
<div class="span-6 last">Red leader</div>
</div>
</b>
{% for item in mli %}
{% ifequal item.type 0 %}
<div class="span-3"><b>Task idea</b></div>
<div class="span-14 last">{{ item.text }}</div>
{% else %}
{% if not forloop.last %}
<div class="span-17 first">
<div class="span-3">{{ item.created|timesince:item.created_next}}</div>
<div class="span-2 prepend-{% evalpy "(item.type-1)*2 " %}">
{% if item.type|in_list:typegl %}<div class="green"><span class="quiet">{{item.get_type_display }}</span></div>
{%else%}<div class="red"><span class="quiet">{{item.get_type_display }}</span></div>{%endif%}
</div>
</div>
{% endif %}
{% endifequal %}
{% endfor %}
</div>
<!--
<br>&nbsp;<br>
<div class="span-17 last">
<h6>Explanation</h6><p>The meeting roles for red/green leader is defined as follows</p>
<dl>
<dt>Green role 1</dt><dd>TEXT</dd>
<dt>Green role 2</dt><dd>TEXT</dd>
<dt>Green role 3</dt><dd>TEXT</dd>
<dt>Red role 1</dt><dd>TEXT</dd>
<dt>Red role 2</dt><dd>TEXT</dd>
<dt>Red role 3</dt><dd>TEXT</dd>
</dl>
</div>
-->
<!--</table>-->
\ No newline at end of file
dev/dkbn2/dkbn2/templates/meeting/meeting_communication_form.html
+ 2
− 2
View file @ d4d81895
......@@ -4,11 +4,11 @@
{% block communication %}
<form action="" method="post">
{% for c in communication %}
{% ifequal c.id communication_id %}
{% if c.id == communication_id %}
{% communication_form c form meeting %}
{% else %}
{% communication c meeting %}
{% endifequal%}
{% endif %}
{% endfor %}
{% if not communication_id %}
{% communication_form c form meeting %}
......
dev/dkbn2/dkbn2/templates/meeting/meeting_communication_form.html~ deleted 100644 → 0
+ 0
− 18
View file @ a67ab906
{% extends "meeting/meeting_stage5_details.html" %}
{% load feedback %}
{% block button %}{% endblock%}
{% block communication %}
<form action="" method="post">
{% for c in communication %}
{% ifequal c.id communication_id %}
{% communication_form c form meeting %}
{% else %}
{% communication c meeting %}
{% endifequal%}
{% endfor %}
{% if not communication_id %}
{% communication_form c form meeting %}
{% endif%}
<input type="submit" value="Submit">
</form>
{% endblock %}
\ No newline at end of file
dev/dkbn2/dkbn2/templates/preject/preject_list.html
+ 1
− 1
View file @ d4d81895
......@@ -20,7 +20,7 @@
{% load formatting %}
{% block bar %}
{% box "Actions" %}
{% url pages.views.preject_create as create %}
{% url "preject_create" as create %}
{% button create "page_add" "Create preject item" %}
{% endbox %}
{% endblock %}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment