From 53266626b06667f93b31580c2e96189af51994a8 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Fri, 27 Dec 2013 21:34:05 +0100 Subject: [PATCH] Add templates for VPS list and admin node list --- frontend/templates/pure/admin/node/add.tpl | 50 +++++++++++++++++++++ frontend/templates/pure/admin/node/list.tpl | 30 +++++++++++++ frontend/templates/pure/client/vps/list.tpl | 2 +- frontend/templates/pure/static/css/cvm.css | 16 +++++-- scss/pure/cvm.scss | 21 ++++++++- 5 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 frontend/templates/pure/admin/node/add.tpl create mode 100644 frontend/templates/pure/admin/node/list.tpl diff --git a/frontend/templates/pure/admin/node/add.tpl b/frontend/templates/pure/admin/node/add.tpl new file mode 100644 index 0000000..9a3388b --- /dev/null +++ b/frontend/templates/pure/admin/node/add.tpl @@ -0,0 +1,50 @@ +

{%!title-admin-addnode}

+ +{%if isempty|errors == false} +
+
{%!error-form}
+
+
    + {%foreach error in errors} +
  • {%?error}
  • + {%/foreach} +
+
+
+{%/if} + +
+
+ + {%input type="text" group="addnode" name="name"} +
+ +
+ + {%input type="text" group="addnode" name="hostname"} +
+ +
+ + {%input type="text" group="addnode" name="location"} +
+ +
+ + {%input type="checkbox" group="addnode" name="customkey" data-enable-group="customkey" class="enabler"} +
+ +
+ + {%input type="file" group="addnode" name="publickey" disabled="disabled"} +
+ +
+ + {%input type="file" group="addnode" name="privatekey" disabled="disabled"} +
+ +
+ +
+
diff --git a/frontend/templates/pure/admin/node/list.tpl b/frontend/templates/pure/admin/node/list.tpl new file mode 100644 index 0000000..1203a6b --- /dev/null +++ b/frontend/templates/pure/admin/node/list.tpl @@ -0,0 +1,30 @@ +

{%!title-admin-nodelist}

+ + + + + + + + + + + + {%foreach node in nodes} + + + + + {%/foreach} + +
{%!list-column-hostname}{%!list-column-location}
+ + {%?node[hostname]} + + + {%?node[location]} +
diff --git a/frontend/templates/pure/client/vps/list.tpl b/frontend/templates/pure/client/vps/list.tpl index 7470a8f..0a8f3b1 100644 --- a/frontend/templates/pure/client/vps/list.tpl +++ b/frontend/templates/pure/client/vps/list.tpl @@ -1,4 +1,4 @@ - +
diff --git a/frontend/templates/pure/static/css/cvm.css b/frontend/templates/pure/static/css/cvm.css index 52506c6..3b75474 100644 --- a/frontend/templates/pure/static/css/cvm.css +++ b/frontend/templates/pure/static/css/cvm.css @@ -2,7 +2,8 @@ width: 960px; margin: 0px auto; } .wrapper h1, .wrapper h2, .wrapper h3, .wrapper h4, .wrapper h5, .wrapper h6 { - margin-top: 4px; } + margin-top: 4px; + margin-bottom: 7px; } .wrapper .pure-g > div { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -30,10 +31,10 @@ font-size: 15px; } .wrapper .header .logo { margin-bottom: 8px; } - .wrapper .menu { + .wrapper .pure-menu-horizontal { background-color: #F1F1F1; margin-bottom: 16px; } - .wrapper .menu a:hover { + .wrapper .pure-menu-horizontal a:hover { background-color: #E6E6E6; } .wrapper .contents #form_login { background-color: #F1F1F1; @@ -44,5 +45,12 @@ .wrapper .contents .narrow-wrapper { width: 420px; margin: 0px auto; } - .wrapper .contents table.vps-list { + .wrapper .contents table.stretch { width: 100%; } + .wrapper .contents .submenu { + font-size: 14px; + margin-bottom: 4px; } + .wrapper .contents .submenu i.fa { + margin-right: 0px; } + .wrapper .contents .submenu li a { + padding: 5px 10px; } diff --git a/scss/pure/cvm.scss b/scss/pure/cvm.scss index 57777e7..99ea90b 100644 --- a/scss/pure/cvm.scss +++ b/scss/pure/cvm.scss @@ -6,6 +6,7 @@ h1, h2, h3, h4, h5, h6 { margin-top: 4px; + margin-bottom: 7px; } .pure-g > div { @@ -67,7 +68,7 @@ } } - .menu + .pure-menu-horizontal { background-color: #F1F1F1; margin-bottom: 16px; @@ -98,9 +99,25 @@ margin: 0px auto; } - table.vps-list + table.stretch { width: 100%; } + + .submenu + { + font-size: 14px; + margin-bottom: 4px; + + i.fa + { + margin-right: 0px; + } + + li a + { + padding: 5px 10px; + } + } } }