From df043d712432573a4fe35faae9c6daee96ac2e3d Mon Sep 17 00:00:00 2001
From: Dányi Bence <madbence@gmail.com>
Date: Wed, 13 Feb 2013 15:02:48 +0100
Subject: [PATCH] webui: verbose markup removed
---
one/templates/box-filelist.html | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------
one/templates/box-vmlist.html | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------
2 files changed, 222 insertions(+), 226 deletions(-)
diff --git a/one/templates/box-filelist.html b/one/templates/box-filelist.html
index fb75a24..cc5593d 100644
--- a/one/templates/box-filelist.html
+++ b/one/templates/box-filelist.html
@@ -3,135 +3,133 @@
<div class="boxes">
<div class="contentblock">
<h2>{% trans "Data store" %}</h2>
- <div class="content">
- <ul class="file-list">
- <li class="wm small" id="current-location">
- <div class="summary">
- <div class="sort">
- <select data-bind="value: sortBy">
- <option value="name">Név szerint</option>
- <option value="date">Dátum szerint</option>
- <option value="size">Méret szerint</option>
- </select>
- </div>
- <div class="name">
- <small>
- Jelenlegi hely:
- <span data-bind="text: currentPath"></span>
- </small>
- </div>
- <div class="clear"></div>
+ <ul class="file-list">
+ <li class="wm small" id="current-location">
+ <div class="summary">
+ <div class="sort">
+ <select data-bind="value: sortBy">
+ <option value="name">Név szerint</option>
+ <option value="date">Dátum szerint</option>
+ <option value="size">Méret szerint</option>
+ </select>
</div>
- </li>
- </ul>
- <ul class="file-list" id="file-list">
- <li class="wm real" data-bind="visible: notInRoot, click: jumpUp">
- <div class="summary">
- <div class="name filetype-jump-out">..</div>
- <div class="clear"></div>
+ <div class="name">
+ <small>
+ Jelenlegi hely:
+ <span data-bind="text: currentPath"></span>
+ </small>
</div>
- </li>
- <li class="wm small real" data-bind="visible: files().length == 0">
- <div class="summary">
- <div class="name">{% trans "No files." %}</div>
- <div class="clear"></div>
+ <div class="clear"></div>
+ </div>
+ </li>
+ </ul>
+ <ul class="file-list" id="file-list">
+ <li class="wm real" data-bind="visible: notInRoot, click: jumpUp">
+ <div class="summary">
+ <div class="name filetype-jump-out">..</div>
+ <div class="clear"></div>
+ </div>
+ </li>
+ <li class="wm small real" data-bind="visible: files().length == 0">
+ <div class="summary">
+ <div class="name">{% trans "No files." %}</div>
+ <div class="clear"></div>
+ </div>
+ </li>
+ <!-- ko foreach: {data:files,afterAdd:fadeIn,beforeRemove:fadeOutFile} -->
+ <li class="wm real">
+ <div class="summary" data-bind="click: clickHandler">
+ <div class="name" data-bind="text: name, attr: {class: getTypeClass, title: originalName}"></div>
+ <div class="info" data-bind="text: size"></div>
+ <div class="actions">
+ <a href="#" data-bind="click: $parent.rename, clickBubble: false">
+ <img src="/static/icons/pencil.png" alt="{% trans "rename" %}" />
+ </a>
+ <a href="#" data-bind="click: $parent.delete, clickBubble: false">
+ <img src="/static/icons/minus-circle.png" alt="{% trans "remove" %}" />
+ </a>
+ <a href="#" data-bind="click: $parent.download, clickBubble: false">
+ <img src="/static/icons/download-cloud.png" alt="{% trans "download" %}" />
+ </a>
</div>
- </li>
- <!-- ko foreach: {data:files,afterAdd:fadeIn,beforeRemove:fadeOutFile} -->
- <li class="wm real">
- <div class="summary" data-bind="click: clickHandler">
- <div class="name" data-bind="text: name, attr: {class: getTypeClass, title: originalName}"></div>
- <div class="info" data-bind="text: size"></div>
- <div class="actions">
- <a href="#" data-bind="click: $parent.rename, clickBubble: false">
- <img src="/static/icons/pencil.png" alt="{% trans "rename" %}" />
- </a>
- <a href="#" data-bind="click: $parent.delete, clickBubble: false">
- <img src="/static/icons/minus-circle.png" alt="{% trans "remove" %}" />
- </a>
- <a href="#" data-bind="click: $parent.download, clickBubble: false">
- <img src="/static/icons/download-cloud.png" alt="{% trans "download" %}" />
- </a>
- </div>
- <div class="clear"></div>
- </div>
- <div class="details">
- <div class="details-container">
- <ul>
- <li class="date">
- {% trans "Last modification" %}:
- <small class="value" data-bind="text: mTime"></small>
- </li>
- <li class="filetype-text">
- {% trans "Type" %}:
- <span class="value" data-bind="text: type"></span>
- </li>
- </ul>
- </div>
+ <div class="clear"></div>
+ </div>
+ <div class="details">
+ <div class="details-container">
+ <ul>
+ <li class="date">
+ {% trans "Last modification" %}:
+ <small class="value" data-bind="text: mTime"></small>
+ </li>
+ <li class="filetype-text">
+ {% trans "Type" %}:
+ <span class="value" data-bind="text: type"></span>
+ </li>
+ </ul>
</div>
- </li>
- <!-- /ko --> </ul>
- <ul class="file-list">
- <li class="wm small-row">
- <div class="summary" id="new-folder">
- <div class="name filetype-new-folder">{% trans "Create folder" %}</div>
- <div id="new-folder-form">
- <input type="text" placeholder="{% trans "Name of new folder" %}" data-bind="value: newFolderName, click: function(m,e){console.log(arguments); e.preventDefault(); e.stopPropagation(); return false;}" />
- <input type="submit" data-bind="click: newFolder, clickBubble: false" value="Létrehozás" />
- </div>
- <div class="clear"></div>
+ </div>
+ </li>
+ <!-- /ko --> </ul>
+ <ul class="file-list">
+ <li class="wm small-row">
+ <div class="summary" id="new-folder">
+ <div class="name filetype-new-folder">{% trans "Create folder" %}</div>
+ <div id="new-folder-form">
+ <input type="text" placeholder="{% trans "Name of new folder" %}" data-bind="value: newFolderName, click: function(m,e){console.log(arguments); e.preventDefault(); e.stopPropagation(); return false;}" />
+ <input type="submit" data-bind="click: newFolder, clickBubble: false" value="Létrehozás" />
</div>
- </li>
- <li class="file-upload wm small-row">
- <div class="summary" data-bind="click: getUploadURL">
- <div class="quota">
- <div id="upload-progress" class="used" style="background-color: rgba(0,255,0,0.2);" data-bind="style: {width: uploadProgress}"></div>
- </div>
- <div class="name filetype-up">{% trans "File upload" %}</div>
- <div class="clear"></div>
+ <div class="clear"></div>
+ </div>
+ </li>
+ <li class="file-upload wm small-row">
+ <div class="summary" data-bind="click: getUploadURL">
+ <div class="quota">
+ <div id="upload-progress" class="used" style="background-color: rgba(0,255,0,0.2);" data-bind="style: {width: uploadProgress}"></div>
</div>
- <div class="details">
- <div class="container">
- <div id="upload-zone" class="upload-zone">
- <p>{% trans "Drag and drop files here to start uploading." %}</p>
- <p>
- {% trans 'You can also use the <a href="#" id="old-upload">the traditional upload form</a>.' %}
- </p>
- <p>{% trans 'Upload limit is 1GB per file!' %}</p>
- </div>
- <div style="display: none" id="upload-progress-text" class="upload-zone"></div>
- <div style="display: none" id="upload-error" class="upload-zone">
- <p id="upload-error-size" style="display: none">{% trans "Error: File is bigger than 1GB!" %}</p>
- <p id="upload-error-server" style="display: none">{% trans "Error: Upload server is not available!" %}</p>
- <p id="upload-error-overwrite" style="display: none">{% trans "Error: File already exists!" %}</p>
- <p id="upload-error-unknown" style="display: none"></p>
- </div>
- <div style="display: none" class="upload-zone" id="old-upload-form">
- <form action="/" method="POST" data-bind="attr: {action: uploadURL}" enctype="multipart/form-data">
- <input type="file" name="data" />
- <input type="submit" value="Feltöltés" />
- </form>
- </div>
+ <div class="name filetype-up">{% trans "File upload" %}</div>
+ <div class="clear"></div>
+ </div>
+ <div class="details">
+ <div class="container">
+ <div id="upload-zone" class="upload-zone">
+ <p>{% trans "Drag and drop files here to start uploading." %}</p>
+ <p>
+ {% trans 'You can also use the <a href="#" id="old-upload">the traditional upload form</a>.' %}
+ </p>
+ <p>{% trans 'Upload limit is 1GB per file!' %}</p>
</div>
- </div>
- </li>
- <li class="wm small">
- <div class="summary">
- <div class="quota">
- <div class="used" style="background-color: rgba(0,255,0,0.2)" data-bind="style: {width: quota.usedBar}"></div>
- <div class="softLimit" data-bind="style: {left: quota.softPos}"></div>
+ <div style="display: none" id="upload-progress-text" class="upload-zone"></div>
+ <div style="display: none" id="upload-error" class="upload-zone">
+ <p id="upload-error-size" style="display: none">{% trans "Error: File is bigger than 1GB!" %}</p>
+ <p id="upload-error-server" style="display: none">{% trans "Error: Upload server is not available!" %}</p>
+ <p id="upload-error-overwrite" style="display: none">{% trans "Error: File already exists!" %}</p>
+ <p id="upload-error-unknown" style="display: none"></p>
</div>
- <div class="name">
- {% trans "File quota" %}: <abbr data-bind="text: quota.used" title="{% trans "Used space" %}"></abbr>
- / <abbr data-bind="text: quota.soft" title="{% trans "soft limit" %}"></abbr>
- (
- <abbr title="{% trans "hard limit" %}" data-bind="text: quota.hard"></abbr>
- )
+ <div style="display: none" class="upload-zone" id="old-upload-form">
+ <form action="/" method="POST" data-bind="attr: {action: uploadURL}" enctype="multipart/form-data">
+ <input type="file" name="data" />
+ <input type="submit" value="Feltöltés" />
+ </form>
</div>
- <div class="clear"></div>
</div>
- </li>
- </ul>
- </div>
+ </div>
+ </li>
+ <li class="wm small">
+ <div class="summary">
+ <div class="quota">
+ <div class="used" style="background-color: rgba(0,255,0,0.2)" data-bind="style: {width: quota.usedBar}"></div>
+ <div class="softLimit" data-bind="style: {left: quota.softPos}"></div>
+ </div>
+ <div class="name">
+ {% trans "File quota" %}: <abbr data-bind="text: quota.used" title="{% trans "Used space" %}"></abbr>
+ / <abbr data-bind="text: quota.soft" title="{% trans "soft limit" %}"></abbr>
+ (
+ <abbr title="{% trans "hard limit" %}" data-bind="text: quota.hard"></abbr>
+ )
+ </div>
+ <div class="clear"></div>
+ </div>
+ </li>
+ </ul>
</div>
</div>
diff --git a/one/templates/box-vmlist.html b/one/templates/box-vmlist.html
index d2d469c..3bc1d2e 100644
--- a/one/templates/box-vmlist.html
+++ b/one/templates/box-vmlist.html
@@ -4,114 +4,112 @@
{% for i in instances %}
<li class="wm {% if id == i.id %}opened{% endif %}">
<div class="summary {% if id == i.id %}selected-summary{% endif %} {% if i.template.state == "NEW" %}unfinished{% endif %}">
- <!--<div class="id"></div>
- -->
- <div class="name {% if i.state == 'ACTIVE' %}wm-on{% else %}wm-off{% endif %}">{{i.name|truncatechars:20}}</div>
- <div class="status">{{i.state}}</div>
- <div class="actions">
- {% if i.waiting %}
- <img src="/static/load.gif" />
- {% elif i.state == 'ACTIVE' %}
- <a href="{{i.get_connect_uri}}" data-id="{{ i.id }}" class="connect-vm-button" title="{% trans "Connect" %}">
- <img src="/static/icons/plug.png" alt="{% trans "Connect" %}" />
- </a>
- <a href="#" class="stop-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Pause" %}">
- <img src="/static/icons/control-pause.png" alt="{% trans "Pause" %}" />
- </span>
- <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
- <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
- </a>
- <a href="#" class="restart-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Restart" %}">
- <img src="/static/icons/arrow-circle-double.png" alt="↺" />
- </a>
- {% elif i.state == 'PENDING' %}
- <img src="/static/load.gif" />
- {% trans "starting…" %}
- {% elif i.state == 'STOPPED' %}
- <a href="#" class="resume-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Resume" %}">
- <img src="/static/icons/control.png" alt="{% trans "Resume" %}" />
- </span>
- <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
- <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
- </a>
- {% elif i.state == 'FAILED' %}
- <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
- <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
- </a>
- {% endif %}
- </div>
- <div class="clear"></div>
-</div>
-<div class="details">
- <div class="details-container">
- <ul>
- <li class="name">
- {% trans "Hostname" %}:
- <span class="value">{{i.name}}</span>
- <div class="clear"></div>
- </li>
- <li class="os-{{i.template.os_type}}">
- {% trans "System" %}:
- <span class="value">{{i.template.system}}</span>
- <div class="clear"></div>
- </li>
- <li class="template">
- {% trans "Type" %}:
- <span class="value">{{i.share.type}}</span>
- <div class="clear"></div>
- </li>
- <li class="template">
- {% trans "Share" %}:
- <span class="value">{{i.share.name}}</span>
- <div class="clear"></div>
- </li>
- <li class="template">
- {% trans "Template" %}:
- <span class="value">{{i.template.name}}</span>
- <div class="clear"></div>
- </li>
- <li class="type">
- {% trans "Size" %}:
- <span class="value">
- {{i.template.instance_type.name}}:
- <span class="cpu">{{i.template.instance_type.CPU}}</span>
- <span class="memory">{{i.template.instance_type.RAM}}</span>
- <span class="credit">{{i.template.instance_type.credit}}</span>
- </span>
- </li>
- <li class="date">
- {% trans "Created at" %}:
- <span class="value">{{i.created_at}}</span>
- </li>
- {% if i.time_of_suspend %}
- <li class="date">
- {% trans "time of suspend"|capfirst %}:
- <span class="value"> <abbr title="{{i.time_of_suspend}}">{{i.time_of_suspend|timeuntil}}</abbr>
- <a href="#" class="renew-vm-button renew-suspend-vm-button" data-id="{{ i.id }}" title="{% trans "Renew suspend time" %}">
- <img src="/static/icons/control-double.png" alt="{% trans "Renew suspend time" %}" />
- </a>
- </span>
- </li>
- {% endif %}
- {% if i.time_of_delete %}
- <li class="date">
- {% trans "time of delete"|capfirst %}:
- <span class="value"> <abbr title="{{i.time_of_delete}}">{{i.time_of_delete|timeuntil}}</abbr>
- <a href="#" class="renew-vm-button renew-delete-vm-button" data-id="{{ i.id }}" title="{% trans "Renew deletion time" %}">
- <img src="/static/icons/control-double.png" alt="{% trans "Renew deletion time" %}" />
- </a>
- </span>
- </li>
+ <div class="name {% if i.state == 'ACTIVE' %}wm-on{% else %}wm-off{% endif %}">{{i.name|truncatechars:20}}</div>
+ <div class="status">{{i.state}}</div>
+ <div class="actions">
+ {% if i.waiting %}
+ <img src="/static/load.gif" />
+ {% elif i.state == 'ACTIVE' %}
+ <a href="{{i.get_connect_uri}}" data-id="{{ i.id }}" class="connect-vm-button" title="{% trans "Connect" %}">
+ <img src="/static/icons/plug.png" alt="{% trans "Connect" %}" />
+ </a>
+ <a href="#" class="stop-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Pause" %}">
+ <img src="/static/icons/control-pause.png" alt="{% trans "Pause" %}" />
+ </a>
+ <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
+ <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
+ </a>
+ <a href="#" class="restart-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Restart" %}">
+ <img src="/static/icons/arrow-circle-double.png" alt="↺" />
+ </a>
+ {% elif i.state == 'PENDING' %}
+ <img src="/static/load.gif" />
+ {% trans "starting…" %}
+ {% elif i.state == 'STOPPED' %}
+ <a href="#" class="resume-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Resume" %}">
+ <img src="/static/icons/control.png" alt="{% trans "Resume" %}" />
+ </a>
+ <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
+ <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
+ </a>
+ {% elif i.state == 'FAILED' %}
+ <a href="#" class="delete-vm-button" data-name="{{ i.name}}" data-id="{{ i.id }}" title="{% trans "Delete" %}">
+ <img src="/static/icons/minus-circle.png" alt="{% trans "Delete" %}" />
+ </a>
{% endif %}
- <li>
-
- <span class="value">
- <a href="/vm/show/{{i.id}}/" title="{{i.name}}">{% trans "More details" %}</a>
- </span>
- </li>
- </ul>
+ </div>
+ <div class="clear"></div>
+ </div>
+ <div class="details">
+ <div class="details-container">
+ <ul>
+ <li class="name">
+ {% trans "Hostname" %}:
+ <span class="value">{{i.name}}</span>
+ <div class="clear"></div>
+ </li>
+ <li class="os-{{i.template.os_type}}">
+ {% trans "System" %}:
+ <span class="value">{{i.template.system}}</span>
+ <div class="clear"></div>
+ </li>
+ <li class="template">
+ {% trans "Type" %}:
+ <span class="value">{{i.share.type}}</span>
+ <div class="clear"></div>
+ </li>
+ <li class="template">
+ {% trans "Share" %}:
+ <span class="value">{{i.share.name}}</span>
+ <div class="clear"></div>
+ </li>
+ <li class="template">
+ {% trans "Template" %}:
+ <span class="value">{{i.template.name}}</span>
+ <div class="clear"></div>
+ </li>
+ <li class="type">
+ {% trans "Size" %}:
+ <span class="value">
+ {{i.template.instance_type.name}}:
+ <span class="cpu">{{i.template.instance_type.CPU}}</span>
+ <span class="memory">{{i.template.instance_type.RAM}}</span>
+ <span class="credit">{{i.template.instance_type.credit}}</span>
+ </span>
+ </li>
+ <li class="date">
+ {% trans "Created at" %}:
+ <span class="value">{{i.created_at}}</span>
+ </li>
+ {% if i.time_of_suspend %}
+ <li class="date">
+ {% trans "time of suspend"|capfirst %}:
+ <span class="value"> <abbr title="{{i.time_of_suspend}}">{{i.time_of_suspend|timeuntil}}</abbr>
+ <a href="#" class="renew-vm-button renew-suspend-vm-button" data-id="{{ i.id }}" title="{% trans "Renew suspend time" %}">
+ <img src="/static/icons/control-double.png" alt="{% trans "Renew suspend time" %}" />
+ </a>
+ </span>
+ </li>
+ {% endif %}
+ {% if i.time_of_delete %}
+ <li class="date">
+ {% trans "time of delete"|capfirst %}:
+ <span class="value"> <abbr title="{{i.time_of_delete}}">{{i.time_of_delete|timeuntil}}</abbr>
+ <a href="#" class="renew-vm-button renew-delete-vm-button" data-id="{{ i.id }}" title="{% trans "Renew deletion time" %}">
+ <img src="/static/icons/control-double.png" alt="{% trans "Renew deletion time" %}" />
+ </a>
+ </span>
+ </li>
+ {% endif %}
+ <li>
+
+ <span class="value">
+ <a href="/vm/show/{{i.id}}/" title="{{i.name}}">{% trans "More details" %}</a>
+ </span>
+ </li>
+ </ul>
+ </div>
</div>
-</div>
</li>
{% endfor %}
{% else %}
--
libgit2 0.26.0