xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-15 12:17:47 +00:00
Code Issues Projects Releases Wiki Activity

Clean up assemble html to be less odd looking

Browse Source
This commit is contained in:
Jarrod Johnson 2013-11-26 09:13:22 -05:00
parent d8efb18034
commit b35144e282
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
confluent/httpapi.py
View File

@ -247,36 +247,35 @@ def resourcehandler(env, start_response):
def _assemble_html(responses, resource, querydict, url):
yield '<html><head><title>'
yield 'Confluent REST Explorer: ' + resource + '</title></head>'
yield '<body><form action="' + resource + '" method="post">'
yield '<html><head><title>' \
'Confluent REST Explorer: ' + resource + '</title></head>' \
'<body><form action="' + resource + '" method="post">'
if querydict:
yield 'Response to input data:<br>'
yield json.dumps(querydict, separators=(',', ': '),
indent=4, sort_keys=True)
yield '<hr>'
yield 'Only fields that have their boxes checked will have their '
yield 'respective values honored by the confluent server.<hr>'
yield '<input type="hidden" name="restexplorerhonorkey" value="">'
yield '<a rel="self" href="%s">%s</a><br>' % (resource, resource)
yield 'Response to input data:<br>' + \
json.dumps(querydict, separators=(',', ': '),
indent=4, sort_keys=True) + '<hr>'
yield 'Only fields that have their boxes checked will have their ' \
'respective values honored by the confluent server.<hr>' \
'<input type="hidden" name="restexplorerhonorkey" value="">' + \
'<a rel="self" href="%s">%s</a><br>' % (resource, resource)
if url == '/':
iscollection = True
elif resource[-1] == '/':
iscollection = True
yield '<a rel="collection" href="../">../</a><br>'
else:
iscollection = False
yield '<a rel="collection" href="./">./</a><br>'
pendingrsp = []
for rsp in responses:
if isinstance(rsp, confluent.messages.LinkRelation):
yield rsp.html()
yield "<br>"
yield rsp.html() + "<br>"
else:
pendingrsp.append(rsp)
for rsp in pendingrsp:
yield rsp.html()
yield "<br>"
yield rsp.html()+ "<br>"
print url
if not iscollection:
yield '<input value="update" name="restexplorerop" type="submit"></form></body></html>'

2
confluent/pluginapi.py
View File

@ -112,6 +112,8 @@ def delete_node_collection(collectionpath, configmanager):
node = collectionpath[-1]
configmanager.del_nodes([node])
yield msg.DeletedResource()
else:
raise Exception("Not implemented")
def enumerate_node_collection(collectionpath, configmanager):
if collectionpath == [ 'node' ]: #it is simple '/node/', need a list of nodes