Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9fb467a7
authored
Mar 03, 2018
by
Szabolcs Gelencser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix vxlanedit html
parent
fda9c192
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
94 deletions
+38
-94
.idea/workspace.xml
+37
-92
circle/network/templates/network/vxlan-create.html
+1
-1
circle/network/templates/network/vxlan-edit.html
+0
-1
No files found.
.idea/workspace.xml
View file @
9fb467a7
...
@@ -2,17 +2,8 @@
...
@@ -2,17 +2,8 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"1fbec8af-5a7c-40f9-b994-83ac07d1ae1d"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"1fbec8af-5a7c-40f9-b994-83ac07d1ae1d"
name=
"Default"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/circle/db.sqlite3"
afterPath=
"$PROJECT_DIR$/circle/circle/db.sqlite3"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/index-vxlans.html"
afterPath=
"$PROJECT_DIR$/circle/dashboard/templates/dashboard/index-vxlans.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/dashboard/views/index.py"
afterPath=
"$PROJECT_DIR$/circle/dashboard/views/index.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/forms.py"
afterPath=
"$PROJECT_DIR$/circle/network/forms.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/models.py"
afterPath=
"$PROJECT_DIR$/circle/network/models.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
afterPath=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/urls.py"
afterPath=
"$PROJECT_DIR$/circle/network/urls.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/network/views.py"
afterPath=
"$PROJECT_DIR$/circle/network/views.py"
/>
<change
beforePath=
"$PROJECT_DIR$/circle/openstack_api/nova.py"
afterPath=
"$PROJECT_DIR$/circle/openstack_api/nova.py"
/>
</list>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
@@ -38,56 +29,10 @@
...
@@ -38,56 +29,10 @@
</component>
</component>
<component
name=
"FileEditorManager"
>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"urls.py"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"227"
>
<caret
line=
"137"
column=
"0"
lean-forward=
"true"
selection-start-line=
"137"
selection-start-column=
"0"
selection-end-line=
"137"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#732#764#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"views.py"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/views.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"204"
>
<caret
line=
"996"
column=
"38"
lean-forward=
"false"
selection-start-line=
"996"
selection-start-column=
"38"
selection-end-line=
"996"
selection-end-column=
"38"
/>
<folding>
<element
signature=
"e#732#746#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"neutron.py"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/circle/openstack_api/neutron.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"201"
>
<caret
line=
"1053"
column=
"26"
lean-forward=
"false"
selection-start-line=
"1053"
selection-start-column=
"26"
selection-end-line=
"1053"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"e#804#842#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"vxlan-create.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1"
>
<caret
line=
"1"
column=
"7"
lean-forward=
"false"
selection-start-line=
"1"
selection-start-column=
"7"
selection-end-line=
"1"
selection-end-column=
"7"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"forms.py"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"forms.py"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/forms.py"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/forms.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
324
"
>
<state
relative-caret-position=
"
465
"
>
<caret
line=
"381"
column=
"0"
lean-forward=
"false"
selection-start-line=
"381"
selection-start-column=
"0"
selection-end-line=
"381"
selection-end-column=
"0"
/>
<caret
line=
"381"
column=
"0"
lean-forward=
"false"
selection-start-line=
"381"
selection-start-column=
"0"
selection-end-line=
"381"
selection-end-column=
"0"
/>
<folding>
<folding>
<element
signature=
"e#732#775#0"
expanded=
"true"
/>
<element
signature=
"e#732#775#0"
expanded=
"true"
/>
...
@@ -96,11 +41,11 @@
...
@@ -96,11 +41,11 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"vxlan-edit.html"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"vxlan-edit.html"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
289
"
>
<state
relative-caret-position=
"
391
"
>
<caret
line=
"23"
column=
"
27"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"27"
selection-end-line=
"23"
selection-end-column=
"27
"
/>
<caret
line=
"23"
column=
"
0"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"0"
selection-end-line=
"23"
selection-end-column=
"0
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
...
@@ -217,11 +162,11 @@
...
@@ -217,11 +162,11 @@
<option
value=
"$PROJECT_DIR$/circle/openstack_api/base.py"
/>
<option
value=
"$PROJECT_DIR$/circle/openstack_api/base.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/dashboard/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/urls.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
/>
<option
value=
"$PROJECT_DIR$/circle/openstack_api/nova.py"
/>
<option
value=
"$PROJECT_DIR$/circle/openstack_api/nova.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/forms.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/forms.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/views.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/views.py"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
/>
<option
value=
"$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -854,7 +799,7 @@
...
@@ -854,7 +799,7 @@
<state
relative-caret-position=
"465"
>
<state
relative-caret-position=
"465"
>
<caret
line=
"78"
column=
"63"
lean-forward=
"false"
selection-start-line=
"78"
selection-start-column=
"60"
selection-end-line=
"78"
selection-end-column=
"63"
/>
<caret
line=
"78"
column=
"63"
lean-forward=
"false"
selection-start-line=
"78"
selection-start-column=
"60"
selection-end-line=
"78"
selection-end-column=
"63"
/>
<folding>
<folding>
<element
signature=
"e#731#751#0"
expanded=
"
tru
e"
/>
<element
signature=
"e#731#751#0"
expanded=
"
fals
e"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
...
@@ -909,53 +854,55 @@
...
@@ -909,53 +854,55 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"23"
column=
"27"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"27"
selection-end-line=
"23"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/forms.py"
>
<entry
file=
"file://$PROJECT_DIR$/circle/dashboard/forms.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"212"
>
<state
relative-caret-position=
"212"
>
<caret
line=
"1702"
column=
"27"
lean-forward=
"false"
selection-start-line=
"1702"
selection-start-column=
"27"
selection-end-line=
"1702"
selection-end-column=
"27"
/>
<caret
line=
"1702"
column=
"27"
lean-forward=
"false"
selection-start-line=
"1702"
selection-start-column=
"27"
selection-end-line=
"1702"
selection-end-column=
"27"
/>
<folding>
<folding>
<element
signature=
"e#732#770#0"
expanded=
"
tru
e"
/>
<element
signature=
"e#732#770#0"
expanded=
"
fals
e"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/
network/forms.py
"
>
<entry
file=
"file://$PROJECT_DIR$/circle/
dashboard/templates/dashboard/vm-plain-image-create.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"324"
>
<state
relative-caret-position=
"119"
>
<caret
line=
"381"
column=
"0"
lean-forward=
"false"
selection-start-line=
"381"
selection-start-column=
"0"
selection-end-line=
"381"
selection-end-column=
"0"
/>
<caret
line=
"7"
column=
"2"
lean-forward=
"false"
selection-start-line=
"7"
selection-start-column=
"2"
selection-end-line=
"16"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/urls.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"227"
>
<caret
line=
"137"
column=
"0"
lean-forward=
"false"
selection-start-line=
"137"
selection-start-column=
"0"
selection-end-line=
"137"
selection-end-column=
"0"
/>
<folding>
<folding>
<element
signature=
"e#732#7
75
#0"
expanded=
"true"
/>
<element
signature=
"e#732#7
64
#0"
expanded=
"true"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/
dashboard/templates/dashboard/vm-plain-image-create.html
"
>
<entry
file=
"file://$PROJECT_DIR$/circle/
network/views.py
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"119"
>
<state
relative-caret-position=
"272"
>
<caret
line=
"7"
column=
"2"
lean-forward=
"false"
selection-start-line=
"7"
selection-start-column=
"2"
selection-end-line=
"16"
selection-end-column=
"9"
/>
<caret
line=
"1000"
column=
"23"
lean-forward=
"false"
selection-start-line=
"1000"
selection-start-column=
"23"
selection-end-line=
"1000"
selection-end-column=
"23"
/>
<folding
/>
<folding>
<element
signature=
"e#732#746#0"
expanded=
"true"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/templates/network/vxlan-create.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1
"
>
<state
relative-caret-position=
"
255
"
>
<caret
line=
"1
"
column=
"7"
lean-forward=
"false"
selection-start-line=
"1"
selection-start-column=
"7"
selection-end-line=
"1"
selection-end-column=
"7
"
/>
<caret
line=
"1
5"
column=
"23"
lean-forward=
"true"
selection-start-line=
"15"
selection-start-column=
"23"
selection-end-line=
"15"
selection-end-column=
"23
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/openstack_api/neutron.py"
>
<entry
file=
"file://$PROJECT_DIR$/circle/openstack_api/neutron.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
201
"
>
<state
relative-caret-position=
"
-3
"
>
<caret
line=
"1053"
column=
"26"
lean-forward=
"false"
selection-start-line=
"1053"
selection-start-column=
"26"
selection-end-line=
"1053"
selection-end-column=
"26"
/>
<caret
line=
"1053"
column=
"26"
lean-forward=
"false"
selection-start-line=
"1053"
selection-start-column=
"26"
selection-end-line=
"1053"
selection-end-column=
"26"
/>
<folding>
<folding>
<element
signature=
"e#804#842#0"
expanded=
"true"
/>
<element
signature=
"e#804#842#0"
expanded=
"true"
/>
...
@@ -963,23 +910,21 @@
...
@@ -963,23 +910,21 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/
url
s.py"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/
form
s.py"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
227
"
>
<state
relative-caret-position=
"
465
"
>
<caret
line=
"
137"
column=
"0"
lean-forward=
"true"
selection-start-line=
"137"
selection-start-column=
"0"
selection-end-line=
"137
"
selection-end-column=
"0"
/>
<caret
line=
"
381"
column=
"0"
lean-forward=
"false"
selection-start-line=
"381"
selection-start-column=
"0"
selection-end-line=
"381
"
selection-end-column=
"0"
/>
<folding>
<folding>
<element
signature=
"e#732#7
64
#0"
expanded=
"true"
/>
<element
signature=
"e#732#7
75
#0"
expanded=
"true"
/>
</folding>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/circle/network/
views.py
"
>
<entry
file=
"file://$PROJECT_DIR$/circle/network/
templates/network/vxlan-edit.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"204"
>
<state
relative-caret-position=
"391"
>
<caret
line=
"996"
column=
"38"
lean-forward=
"false"
selection-start-line=
"996"
selection-start-column=
"38"
selection-end-line=
"996"
selection-end-column=
"38"
/>
<caret
line=
"23"
column=
"0"
lean-forward=
"false"
selection-start-line=
"23"
selection-start-column=
"0"
selection-end-line=
"23"
selection-end-column=
"0"
/>
<folding>
<folding
/>
<element
signature=
"e#732#746#0"
expanded=
"true"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
circle/network/templates/network/vxlan-create.html
View file @
9fb467a7
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<form
method=
"POST"
"
>
<form
method=
"POST"
>
{% csrf_token %}
{% csrf_token %}
{{ form.name|as_crispy_field }}
{{ form.name|as_crispy_field }}
<button
class=
"btn btn-success pull-right text-right"
type=
"submit"
>
<button
class=
"btn btn-success pull-right text-right"
type=
"submit"
>
...
...
circle/network/templates/network/vxlan-edit.html
View file @
9fb467a7
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
<div
class=
"page-header"
>
<div
class=
"page-header"
>
<h3>
{% trans "Connected virtual machines" %}
</h3>
<h3>
{% trans "Connected virtual machines" %}
</h3>
</div>
</div>
{# {% render_table vm_list %}#}
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
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