From 10084b7eb9ff6217c7692c60ad697f87dfce57c8 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Wed, 6 Sep 2017 14:17:42 -0600 Subject: [PATCH 01/23] added stuff --- css/styles.css | 119 +++++++++++++++++++++++++++++++++- templates/splash-page.html | 2 +- templates/website.html | 128 +++++++++++++++++++++++++++++++++++++ 3 files changed, 245 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index 7dd4293..fe41340 100644 --- a/css/styles.css +++ b/css/styles.css @@ -58,11 +58,12 @@ align-items: center; } .button-container.active .side-menu-button { - background: steelblue; - color: white; + color: #fff; + background-color: #286090; + border-color: #122b40; } .button-container.active .button-title { - color: steelblue; + color: #286090; } .button-container a:hover { text-decoration: none; @@ -148,3 +149,115 @@ overflow: hidden; background-color: #e5e5e5; } + +.demo-title { + text-align: center; + font-size: 3rem; + margin-bottom: 50px; +} +.invite-option { + border: 1px solid #e5e5e5; +} +.invite-card-container { + display: table; + width: 100%; +} +.invite-card-container .invite-option { + width: 28%; + background: white; + float: left; + padding: 2%; + text-align: center; + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; +} +.invite-card-container .invite-option:nth-child(even) { + margin: 0 2%; +} +.invite-card-container .invite-option:hover { + cursor: pointer; + box-shadow: 0px 2px 30px rgba(0, 0, 0, 0.3); + -webkit-transform: scale(1.04); + transform: scale(1.04); +} +.invite-card-container .invite-option:hover i, .invite-card-container .invite-option:hover h1, .invite-card-container .invite-option:hover span, .invite-card-container .invite-option:hover b { + color: #286090; +} +.invite-card-container .invite-option:hover .front { + opacity: 0; + visibility: hidden; +} +.invite-card-container .invite-option:hover .back { + opacity: 1 !important; + visibility: visible !important; +} +.invite-card-container .invite-option:hover .back a.button { + -webkit-transform: translateY(0px) !important; + transform: translateY(0px) !important; +} +.invite-card-container .invite-option hr { + border: none; + border-bottom: 1px solid #F0F0F0; +} +.invite-card-container .invite-option i { + font-size: 3rem; + color: #D8D8D8; + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; +} +.invite-card-container .invite-option h1 { + margin: 10px 0; + color: #212121; + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; +} +.invite-card-container .invite-option p { + color: #999; + padding: 0 10px; + line-height: 1.3; +} +.invite-card-container .invite-option .price { + position: relative; +} +.invite-card-container .invite-option .price .front span.price { + font-size: 2rem; + text-transform: uppercase; + margin-top: 20px; + display: block; + font-weight: 700; + position: relative; +} +.invite-card-container .invite-option .price .front span.price b { + position: absolute; + font-size: 1rem; + margin-left: 2px; + font-weight: 600; +} +.invite-card-container .invite-option .price .back { + opacity: 0; + visibility: hidden; + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; +} +.invite-card-container .invite-option .price .back a.button { + background: #286090; + padding: 15px 20px; + display: inline-block; + text-decoration: none; + color: white; + position: absolute; + font-size: 13px; + top: -5px; + left: 0; + right: 0; + width: 150px; + margin: auto; + text-transform: uppercase; + -webkit-transform: translateY(20px); + transform: translateY(20px); + -webkit-transition: all .3s ease-in-out; + transition: all .3s ease-in-out; +} +.invite-card-container .invite-option .price .back a.button:hover { + background: #286090; +} diff --git a/templates/splash-page.html b/templates/splash-page.html index 83c8c3d..75cb110 100644 --- a/templates/splash-page.html +++ b/templates/splash-page.html @@ -3,7 +3,7 @@

Sign in

-
Resume with {{ profile.email }}
+
Resume with {{ profile.email }} | {{ profile.issuer }}
diff --git a/templates/website.html b/templates/website.html index aad5aa6..76e5b2b 100644 --- a/templates/website.html +++ b/templates/website.html @@ -1,3 +1,131 @@ +
+
+

Create a new Website

+ + + +
+
+ + +
+
+

Invite Code

+
+ +
+
+
+   +
+
+ Accept Invite +
+
+
+
+ + +
+

Your Websites

+
+

example.com

+
+
+
+ +
+ +
+
+
+
+ + + + + -
@@ -226,13 +295,11 @@ Sites > blogs > blog.jane.smith.net -
+ / friend@email.com - pending (rwx) - -
+ From 418bd74f8baa81c2f69d94856e4a7e7abb10421a Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Thu, 7 Sep 2017 15:30:14 -0600 Subject: [PATCH 03/23] fixxxx --- templates/website.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/website.html b/templates/website.html index da6d625..85bd2f9 100644 --- a/templates/website.html +++ b/templates/website.html @@ -172,7 +172,6 @@

Select Upload:

-
@@ -183,7 +182,7 @@
99% | 1 MiB / 100 MiB
-
+
From e49337e936c4bcfee4d8b1ed741b94f2caa34284 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Thu, 7 Sep 2017 15:47:48 -0600 Subject: [PATCH 04/23] added delete --- templates/website.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/website.html b/templates/website.html index 85bd2f9..9acab00 100644 --- a/templates/website.html +++ b/templates/website.html @@ -162,9 +162,9 @@

Share Path: /

Actions Allowed: rwx

- +
+ +
From 2fdb097a0ac8f74a73fbd5091c7a723c696b5896 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Mon, 11 Sep 2017 11:18:52 -0600 Subject: [PATCH 05/23] added file tree. needs logic tho. --- css/styles.css | 22 ++++++++++++++++- templates/website.html | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index e512698..65a71b5 100644 --- a/css/styles.css +++ b/css/styles.css @@ -34,7 +34,9 @@ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05); box-shadow: inset 0 1px 1px rgba(0,0,0,.05); } - +.ls-none { + list-style: none; +} /* Side Menu */ .side-menu { padding-top: 10px; @@ -293,3 +295,21 @@ list-style: none; -webkit-padding-start: 0px; } + + + + + + + +.file-tree-container .file_tree { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; } +.file-tree-container .file_tree input[type=radio], .file-tree-container .file_tree input[type=checkbox] { width: 0; height: 0; opacity: 0; position: absolute; margin: 0; } +.file-tree-container .file_tree label { display: block; width: 100%; font-size: 14px; color: black; height: 30px; line-height: 30px; padding: 0 8px; cursor: pointer; white-space: nowrap; } +.file-tree-container .file_tree label:hover { color: #a4d3ff; } .file_tree .dir_wrapper { display: none; padding-left: 28px; } +.file-tree-container .file_tree .dir_wrapper label { padding-left: 0; } +.file-tree-container .file_tree input[type=checkbox] + label { color: black; padding-left: 30px; } +.file-tree-container .file_tree input[type=checkbox] + label:hover { color: #a4d3ff; } +.file-tree-container .file_tree input[type=radio]:checked + label { color: #337ab7; } +.file-tree-container .file_tree input[type=checkbox]:checked + label + .dir_wrapper { display: block; } +.file-tree-container .file_tree input[type=checkbox] + label { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAABQCAYAAABxs9dPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc0Q0FDNEY5NDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc0Q0FDNEZBNDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzRDQUM0Rjc0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzRDQUM0Rjg0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7T+9ssAAABJ0lEQVR42uzZMQrCMBgF4FbE0UFPILg5qdAbCA7q5qK7p3Bw8BK6u4giboKCJxDB1cFdsOjapb5ACyoiNG3pj30P3hj4SBOaEPP6cFwjWG5oAz0aMSSjMaaIbtGqFJCP2qE1KSCVgjdTkaKyIccr1B49SwGp5NF6HCAbvRjJpOTN9htog/YTAs3QXthFbUja9gQRRBBBBBFEEEEEpQVkalyl0zVD6tYxlfbJZK0h13W5ywgiiCCCCCKIIIII+nGmnp/u4g75k4Bj1IviCHXiAg00xlXQbhwo3TXUQRdoTtKibqPLqFFhH/Ba6BpdSQGpNL3+793ej3pRHCbkGPuz/PnmekgIZPNfRhBBBBFEEEEEEURQ8DO1pXGtjirWN1DZKz/Za54CDABbrytKn66XKwAAAABJRU5ErkJggg==); background-size: 18px 40px; background-position: top 7px left 6px; background-repeat: no-repeat; vertical-align: middle; } +.file-tree-container .file_tree input[type=checkbox] + label:hover { background-position: top -18px left 6px; } diff --git a/templates/website.html b/templates/website.html index 9acab00..b3460eb 100644 --- a/templates/website.html +++ b/templates/website.html @@ -197,6 +197,61 @@
+
+
+
+ + +
+ + +
+ + +
+ + + + +
+
+
+ + + +
+ + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + From e3a4858e381cb8012daf264cb58e679866132916 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Mon, 11 Sep 2017 12:40:30 -0600 Subject: [PATCH 06/23] two file trees, just in case one doesnt work --- css/styles.css | 6 ++++++ templates/website.html | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index 65a71b5..8e4e1bc 100644 --- a/css/styles.css +++ b/css/styles.css @@ -313,3 +313,9 @@ .file-tree-container .file_tree input[type=checkbox]:checked + label + .dir_wrapper { display: block; } .file-tree-container .file_tree input[type=checkbox] + label { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAABQCAYAAABxs9dPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc0Q0FDNEY5NDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc0Q0FDNEZBNDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzRDQUM0Rjc0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzRDQUM0Rjg0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7T+9ssAAABJ0lEQVR42uzZMQrCMBgF4FbE0UFPILg5qdAbCA7q5qK7p3Bw8BK6u4giboKCJxDB1cFdsOjapb5ACyoiNG3pj30P3hj4SBOaEPP6cFwjWG5oAz0aMSSjMaaIbtGqFJCP2qE1KSCVgjdTkaKyIccr1B49SwGp5NF6HCAbvRjJpOTN9htog/YTAs3QXthFbUja9gQRRBBBBBFEEEEEpQVkalyl0zVD6tYxlfbJZK0h13W5ywgiiCCCCCKIIIII+nGmnp/u4g75k4Bj1IviCHXiAg00xlXQbhwo3TXUQRdoTtKibqPLqFFhH/Ba6BpdSQGpNL3+793ej3pRHCbkGPuz/PnmekgIZPNfRhBBBBFEEEEEEURQ8DO1pXGtjirWN1DZKz/Za54CDABbrytKn66XKwAAAABJRU5ErkJggg==); background-size: 18px 40px; background-position: top 7px left 6px; background-repeat: no-repeat; vertical-align: middle; } .file-tree-container .file_tree input[type=checkbox] + label:hover { background-position: top -18px left 6px; } + +.file-tree .directory { font-family: monospace; line-height: 2em; } +.file-tree .directory_child { margin-left: 2em; position: relative; } +.file-tree .directory_child:last-child::after { display: none; } +.file-tree .directory_child::before { border-bottom: 1px solid; border-left: 1px solid; content: ""; height: 1em; left: -1em; position: absolute; width: 0.7em; } +.file-tree .directory_child::after { border-left: 1px solid; content: ""; height: 100%; left: -1em; position: absolute; top: 0; } diff --git a/templates/website.html b/templates/website.html index b3460eb..ec900fd 100644 --- a/templates/website.html +++ b/templates/website.html @@ -174,9 +174,9 @@
-
+
-
+
@@ -194,7 +194,6 @@
-
@@ -236,6 +235,39 @@
+
+
+
    +
  • The World +
      +
    • Africa +
        +
      • Egypt
        • +
      +
      • +
    • Antarctica
      • +
    • Asia +
        +
      • Japan
        • +
      • South Korea +
          +
        • Seoul
          • +
        • Incheon
          • +
        +
      • Thailand
        • + +
      +
      • +
    • Australia
      • +
    • Europe
      • +
    • North America
      • +
    • South America
      • + +
    +
+
+
+ From ffef89e77851383001aeb9f191af30e1df4a90e9 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Mon, 11 Sep 2017 13:41:58 -0600 Subject: [PATCH 07/23] adding css --- css/styles.css | 5 ++++- templates/website.html | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index 8e4e1bc..2db1f64 100644 --- a/css/styles.css +++ b/css/styles.css @@ -37,6 +37,9 @@ .ls-none { list-style: none; } +.ls-pd0 { + -webkit-padding-start: 0; +} /* Side Menu */ .side-menu { padding-top: 10px; @@ -318,4 +321,4 @@ .file-tree .directory_child { margin-left: 2em; position: relative; } .file-tree .directory_child:last-child::after { display: none; } .file-tree .directory_child::before { border-bottom: 1px solid; border-left: 1px solid; content: ""; height: 1em; left: -1em; position: absolute; width: 0.7em; } -.file-tree .directory_child::after { border-left: 1px solid; content: ""; height: 100%; left: -1em; position: absolute; top: 0; } +.file-tree .directory_child::after { border-left: 1px solid; content: ""; height: 100%; left: -1em; position: absolute; top: 0; } diff --git a/templates/website.html b/templates/website.html index ec900fd..6c8775d 100644 --- a/templates/website.html +++ b/templates/website.html @@ -237,20 +237,20 @@
-
    +
    • The World -
        +
        • Africa -
            +
            • Egypt
          • Antarctica
          • Asia -
              +
              • Japan
              • South Korea -
                  +
                  • Seoul
                  • Incheon
                  From 0611d314b2912a63a2e07bb4ff8e0a01cbe5bdc5 Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Wed, 13 Sep 2017 16:56:38 -0600 Subject: [PATCH 08/23] fixing account setting login thing --- templates/account-settings.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/account-settings.html b/templates/account-settings.html index 75e88b9..4f1e170 100644 --- a/templates/account-settings.html +++ b/templates/account-settings.html @@ -45,7 +45,7 @@

                  - +
@@ -56,7 +56,7 @@ Use Account
- Sign Out + Sign Out
From 451d6e578a5db52f47ed1630d8aa9b0e78578c9b Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Wed, 20 Sep 2017 12:43:13 -0600 Subject: [PATCH 09/23] building file tree --- css/styles.css | 122 +++++++++++++++--- js/controllers/website-controller.js | 9 +- templates/website.html | 177 ++++++++++++--------------- 3 files changed, 194 insertions(+), 114 deletions(-) diff --git a/css/styles.css b/css/styles.css index 2db1f64..7f1495a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -299,26 +299,116 @@ -webkit-padding-start: 0px; } +/* ————————————————————– + Tree core styles +*/ +.tree { margin: 1em; } +.tree input { + position: absolute; + clip: rect(0, 0, 0, 0); + } +.tree input ~ ul { display: none; } +.tree input:checked ~ ul { display: block; } +/* ————————————————————– + Tree rows +*/ +.tree li { + line-height: 1.2; + position: relative; + padding: 0 0 1em 1em; + } +.tree ul li { padding: 1em 0 0 1em; } -.file-tree-container .file_tree { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; } -.file-tree-container .file_tree input[type=radio], .file-tree-container .file_tree input[type=checkbox] { width: 0; height: 0; opacity: 0; position: absolute; margin: 0; } -.file-tree-container .file_tree label { display: block; width: 100%; font-size: 14px; color: black; height: 30px; line-height: 30px; padding: 0 8px; cursor: pointer; white-space: nowrap; } -.file-tree-container .file_tree label:hover { color: #a4d3ff; } .file_tree .dir_wrapper { display: none; padding-left: 28px; } -.file-tree-container .file_tree .dir_wrapper label { padding-left: 0; } -.file-tree-container .file_tree input[type=checkbox] + label { color: black; padding-left: 30px; } -.file-tree-container .file_tree input[type=checkbox] + label:hover { color: #a4d3ff; } -.file-tree-container .file_tree input[type=radio]:checked + label { color: #337ab7; } -.file-tree-container .file_tree input[type=checkbox]:checked + label + .dir_wrapper { display: block; } -.file-tree-container .file_tree input[type=checkbox] + label { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAABQCAYAAABxs9dPAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc0Q0FDNEY5NDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc0Q0FDNEZBNDFGQjExRTQ4MEQ4ODY5MEFBODE4RDk2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzRDQUM0Rjc0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzRDQUM0Rjg0MUZCMTFFNDgwRDg4NjkwQUE4MThEOTYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7T+9ssAAABJ0lEQVR42uzZMQrCMBgF4FbE0UFPILg5qdAbCA7q5qK7p3Bw8BK6u4giboKCJxDB1cFdsOjapb5ACyoiNG3pj30P3hj4SBOaEPP6cFwjWG5oAz0aMSSjMaaIbtGqFJCP2qE1KSCVgjdTkaKyIccr1B49SwGp5NF6HCAbvRjJpOTN9htog/YTAs3QXthFbUja9gQRRBBBBBFEEEEEpQVkalyl0zVD6tYxlfbJZK0h13W5ywgiiCCCCCKIIIII+nGmnp/u4g75k4Bj1IviCHXiAg00xlXQbhwo3TXUQRdoTtKibqPLqFFhH/Ba6BpdSQGpNL3+793ej3pRHCbkGPuz/PnmekgIZPNfRhBBBBFEEEEEEURQ8DO1pXGtjirWN1DZKz/Za54CDABbrytKn66XKwAAAABJRU5ErkJggg==); background-size: 18px 40px; background-position: top 7px left 6px; background-repeat: no-repeat; vertical-align: middle; } -.file-tree-container .file_tree input[type=checkbox] + label:hover { background-position: top -18px left 6px; } +.tree > li:last-child { padding-bottom: 0; } -.file-tree .directory { font-family: monospace; line-height: 2em; } -.file-tree .directory_child { margin-left: 2em; position: relative; } -.file-tree .directory_child:last-child::after { display: none; } -.file-tree .directory_child::before { border-bottom: 1px solid; border-left: 1px solid; content: ""; height: 1em; left: -1em; position: absolute; width: 0.7em; } -.file-tree .directory_child::after { border-left: 1px solid; content: ""; height: 100%; left: -1em; position: absolute; top: 0; } +/* ————————————————————– + Tree labels +*/ +.tree_label { + position: relative; + display: inline-block; + background: #fff; + } + +label.tree_label { cursor: pointer; } + +label.tree_label:hover { color: #666; } + +/* ————————————————————– + Tree expanded icon +*/ +label.tree_label:before { + background: #000; + color: #fff; + position: relative; + z-index: 1; + float: left; + margin: 0 1em 0 -2em; + width: 1em; + height: 1em; + border-radius: 1em; + content: '+'; + text-align: center; + line-height: .9em; + } + +:checked ~ label.tree_label:before { content: '–'; } + +/* ————————————————————– + Tree branches +*/ +/*.tree li:before { + position: absolute; + top: 0; + bottom: 0; + left: -.5em; + display: block; + width: 0; + border-left: 1px solid #777; + content: ""; + }*/ + +.tree_label:after { + position: absolute; + top: 0; + left: -1.5em; + display: block; + height: 0.5em; + width: 1em; + border-bottom: 1px solid #777; + border-left: 1px solid #777; + border-radius: 0 0 0 .3em; + content: ''; + } + +label.tree_label:after { border-bottom: 0; } + +:checked ~ label.tree_label:after { + border-radius: 0 .3em 0 0; + border-top: 1px solid #777; + border-right: 1px solid #777; + border-bottom: 0; + border-left: 0; + bottom: 0; + top: 0.5em; + height: auto; + } + +.tree li:last-child:before { + height: 1em; + bottom: auto; + } + +.tree > li:last-child:before { display: none; } + +.tree_custom { + display: block; + background: #eee; + padding: 1em; + border-radius: 0.3em; +} diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index f1bc2a1..29ff8ee 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -337,6 +337,7 @@ app.controller('websiteCtrl', [ }); }; vm.Sites.contents = function (r) { + vm.showListFiles = true; var pkg = Auth.oauth3.pkg('www@daplie.com'); return pkg.contents({ hostname: r.domain @@ -346,7 +347,12 @@ app.controller('websiteCtrl', [ //, sub: r.sub , path: r.newPath }).then(function (result) { - window.alert(JSON.stringify(result)); + // window.alert(JSON.stringify(result)); + vm.fileTree = result; + console.log(result); + console.log('data ' , result.data); + result.data.forEach(function(file) { + }); }); }; @@ -379,6 +385,7 @@ app.controller('websiteCtrl', [ }); }; vm.Shares.list = function (r) { + vm.showSharesList = true; var pkg = Auth.oauth3.pkg('www@daplie.com'); return pkg.listShares({ domain: r.domain diff --git a/templates/website.html b/templates/website.html index 6c8775d..1c43e65 100644 --- a/templates/website.html +++ b/templates/website.html @@ -10,7 +10,7 @@
- +

Create a new Website

@@ -79,7 +79,7 @@
- +
@@ -121,12 +121,12 @@ -