[Pkg-owncloud-commits] [php-sabredav] 07/11: Cleaned up browser design.
David Prévot
taffit at moszumanska.debian.org
Thu May 22 17:11:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit 06420c5af1eac06be3026a2cc06dcb644e77209f
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Thu May 22 11:42:34 2014 -0400
Cleaned up browser design.
---
lib/DAV/Browser/Plugin.php | 34 +++---
lib/DAV/Browser/assets/sabredav.css | 219 +++++++++++++++++++++++++++---------
2 files changed, 181 insertions(+), 72 deletions(-)
diff --git a/lib/DAV/Browser/Plugin.php b/lib/DAV/Browser/Plugin.php
index 76c7bf7..b705e6e 100644
--- a/lib/DAV/Browser/Plugin.php
+++ b/lib/DAV/Browser/Plugin.php
@@ -262,8 +262,8 @@ HTML;
}
$html.= '<tr>';
- $html.= '<td class="namecolumn"><a href="' . $this->escapeHTML($fullPath) . '"><span class="oi" data-glyph="'.$type['icon'].'"></span> ' . $this->escapeHTML($displayPath) . '</a></td>';
- $html.= '<td>' . $type['string'] . '</td>';
+ $html.= '<td class="nameColumn"><a href="' . $this->escapeHTML($fullPath) . '"><span class="oi" data-glyph="'.$type['icon'].'"></span> ' . $this->escapeHTML($displayPath) . '</a></td>';
+ $html.= '<td class="typeColumn">' . $type['string'] . '</td>';
$html.= '<td>';
if (isset($subProps['{DAV:}getcontentlength'])) {
$html.=$subProps['{DAV:}getcontentlength'] . ' bytes';
@@ -282,7 +282,7 @@ HTML;
$html.="</section>";
$html.="<section><h1>Properties</h1>";
- $html.="<table>";
+ $html.="<table class=\"propTable\">";
// Allprops request
$propFind = new PropFindAll($path);
@@ -299,21 +299,24 @@ HTML;
$html.="</table>";
$html.="</section>";
-
- $html.="<section><h1>Actions</h1>";
-
+ /* Start of generating actions */
$output = '';
-
if ($this->enablePost) {
$this->server->emit('onHTMLActionsPanel', [$node, &$output]);
}
- $html.=$output;
- $html.="</section>";
+ if ($output) {
+
+ $html.="<section><h1>Actions</h1>";
+ $html.="<div class=\"actions\">\n";
+ $html.=$output;
+ $html.="</div>\n";
+ $html.="</section>\n";
+ }
$html.= "
- <address>Generated by SabreDAV " . $version . " (c)2007-2014 <a href=\"http://sabre.io/\">http://sabre.io/</a></address>
+ <footer>Generated by SabreDAV " . $version . " (c)2007-2014 <a href=\"http://sabre.io/\">http://sabre.io/</a></footer>
</body>
</html>";
@@ -346,17 +349,16 @@ HTML;
ob_start();
echo '<form method="post" action="">
- <h2>Create new folder</h2>
+ <h3>Create new folder</h3>
<input type="hidden" name="sabreAction" value="mkcol" />
- Name:<br />
- <input type="text" name="name" /><br />
+ <label>Name:</label> <input type="text" name="name" /><br />
<input type="submit" value="create" />
</form>
<form method="post" action="" enctype="multipart/form-data">
- <h2>Upload file</h2>
+ <h3>Upload file</h3>
<input type="hidden" name="sabreAction" value="put" />
- Name (optional): <input type="text" name="name" /><br />
- File: <input type="file" name="file" /><br />
+ <label>Name (optional):</label> <input type="text" name="name" /><br />
+ <label>File:</label> <input type="file" name="file" /><br />
<input type="submit" value="upload" />
</form>
';
diff --git a/lib/DAV/Browser/assets/sabredav.css b/lib/DAV/Browser/assets/sabredav.css
index dea9f0d..b369630 100644
--- a/lib/DAV/Browser/assets/sabredav.css
+++ b/lib/DAV/Browser/assets/sabredav.css
@@ -1,103 +1,210 @@
-* {
- box-sizing: border-box;
-}
+/* Start of reset */
-body, input {
- font-family: arial, sans-serif;
- font-size: 14px;
+* {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
-
body {
margin: 0;
- line-height: 22px;
- font-weight: 300;
}
-a {
- text-decoration: none;
- color: #31A1CD;
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
}
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+td,
th {
- text-align: left;
+ padding: 0;
}
-header {
- background-color: #EEE;
-}
+/** End of reset */
-header .logo {
- padding: 5px 10px;
-}
-header .logo img {
- vertical-align: middle;
+body {
+ font-family: 'Roboto', sans-serif;
+ font-size: 14px;
+ line-height: 22px;
+ font-weight: 300;
+}
+h1 {
+ font-size: 42px;
+ line-height: 44px;
+ padding-bottom: 5px;
+ color: #b10610;
+ margin-top: 10px;
+ margin-bottom: 30px;
+}
+h2 {
+ color: #333333;
+ font-size: 28px;
+ line-height: 44px;
+ font-weight: 300;
+}
+h3 {
+ font-size: 21px;
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+a {
+ color: #31a1cd;
+}
+h1 a {
+ text-decoration: none;
+}
+h2 a {
+ color: #333333;
+}
+a:visited {
+ color: #6098a2;
+}
+h2 a:visited {
+ color: #333333;
+}
+a:hover {
+ color: #b10610;
+}
+hr {
+ border: none;
+ border-top: 1px dashed #c9ea75;
+ margin-top: 30px;
+ margin-bottom: 30px;
+}
+header {
+ background: #eeeeee;
}
-
header a {
- font-size: 28px;
- font-weight: 500;
- color: #333;
- text-decoration: none;
+ font-size: 28px;
+ font-weight: 500;
+ color: #333;
+ text-decoration: none;
+}
+.logo {
+ padding: 5px 10px;
+}
+.logo img {
+ vertical-align: middle;
+}
+input, button {
+ font: inherit;
+ color: inherit;
}
input[type=text] {
- border: 1px solid #999;
- font-size: 18px;
+ border: 1px solid #bbbbbb;
+ line-height: 22px;
+ padding: 5px 10px;
+ border-radius: 3px;
}
nav {
padding: 5px;
}
+.btn, button, input[type=submit] {
+ display: inline-block;
+ color: white;
+ background: #4fa3ac;
+ padding: 9px 15px;
+ border-radius: 2px;
+ border: 0;
+ text-decoration: none;
+}
+a.btn:visited {
+ color: white;
+}
+
+.btn.disabled {
+ background: #eeeeee;
+ color: #bbbbbb;
+}
section {
- padding: 5px;
+ margin: 40px 10px;
}
-section h1 {
- font-size: 28px;
- color: #B10610;
+section table {
+ height: 40px;
}
-section h2 {
- font-size: 28px;
- color #333;
- font-weight: 300;
- line-height: 36px;
+.nodeTable tr {
+ border-bottom: 3px solid white;
}
-.btn, input[type=submit] {
- display: inline-block;
- color: white;
- background: #B10610;
- padding: 3px;
- border-radius: 2px;
- border: 0;
+.nodeTable td {
+ padding: 10px 10px 10px 10px;
+
}
-.btn.disabled {
- background: #999;
+.nodeTable a {
+ text-decoration: none;
+}
+
+.nodeTable .nameColumn {
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #ebf5f6;
+ min-width: 200px;
+}
+.nodeTable .oi {
+ color: #b10610;
}
-section table tr {
- background: #EEE;
+.propTable tr {
height: 40px;
}
-section table td {
- padding: 0 10px;
+.propTable th {
+ background: #f6f6f6;
+ padding: 0 10px;
+ text-align: left;
}
-section table .oi {
- color: #B10610;
+.propTable td {
+ padding: 0 10px;
+ background: #eeeeee;
}
-.propTable a {
- color: #
+.actions {
+ border: 1px dotted #76baa6;
+ padding: 20px;
+ margin-bottom: 20px;
+
}
-.nodeTable .namecolumn {
- min-width: 200px;
+.actions h3 {
+ margin-top: 10px;
+ margin-bottom: 30px;
+ padding-bottom: 20px;
+ border-bottom: 1px solid #eeeeee;
}
+.actions label {
+ width: 150px;
+ display: inline-block;
+ line-height: 40px;
+}
+.actions input[type=text] {
+ width: 450px;
+}
+
+.actions input[type=submit] {
+ display: inline-block;
+ margin-left: 153px;
+}
+
+footer {
+ padding: 50px 0;
+ font-size: 80%;
+ text-align: center;
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list