From cee4fc99343da2e0ea9a1b24924e9f87c5be0791 Mon Sep 17 00:00:00 2001 From: djawder Date: Sun, 3 May 2015 01:35:17 +0400 Subject: [PATCH 1/5] test --- New Text Document.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 New Text Document.txt diff --git a/New Text Document.txt b/New Text Document.txt new file mode 100644 index 0000000..e69de29 From d162753a2a5c64f692143dc9d66135134b0c28e0 Mon Sep 17 00:00:00 2001 From: djawder Date: Sun, 3 May 2015 01:40:54 +0400 Subject: [PATCH 2/5] fixed error on loading website - forms.py Error - python indentation --- moc_ui/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/moc_ui/forms.py b/moc_ui/forms.py index 47996e3..7a95c16 100644 --- a/moc_ui/forms.py +++ b/moc_ui/forms.py @@ -138,7 +138,7 @@ def save(self, force_insert=False, force_update=False, commit=True): class CreateVM(forms.Form): name = forms.CharField() - def create(self): + #def create(self): @@ -148,3 +148,5 @@ class DeleteVM(forms.Form): class ControlVM(forms.Form): name = forms.CharField() action = forms.CharField() + + From 5cc9a3619e37f48a6efbefa66b22e964fa64e865 Mon Sep 17 00:00:00 2001 From: djawder Date: Sun, 3 May 2015 01:41:38 +0400 Subject: [PATCH 3/5] added page to UI plus iframe iframe points to HaaS UI --- moc_ui/templates/haas.html | 26 ++++++++++++++++++++++++++ moc_ui/urls.py | 3 +++ moc_ui/views.py | 5 +++++ 3 files changed, 34 insertions(+) create mode 100644 moc_ui/templates/haas.html diff --git a/moc_ui/templates/haas.html b/moc_ui/templates/haas.html new file mode 100644 index 0000000..96c3adc --- /dev/null +++ b/moc_ui/templates/haas.html @@ -0,0 +1,26 @@ + +{% extends "base.html" %} + {% load staticfiles %} + + {% block title %}HaaS{% endblock %} + +{% block content %} +
+ +
+
+
+
+ +
+ +
+