summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/plugins/extension/helper/gui.php16
-rw-r--r--lib/plugins/extension/images/icons.xcfbin43016 -> 67195 bytes
-rw-r--r--lib/plugins/extension/images/plugin.pngbin6259 -> 6824 bytes
-rw-r--r--lib/plugins/extension/images/template.pngbin6802 -> 7547 bytes
-rw-r--r--lib/plugins/extension/lang/en/lang.php3
-rw-r--r--lib/plugins/extension/style.less477
6 files changed, 199 insertions, 297 deletions
diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php
index 2c2a19bf8..139a1a16a 100644
--- a/lib/plugins/extension/helper/gui.php
+++ b/lib/plugins/extension/helper/gui.php
@@ -90,9 +90,9 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
echo $this->locale_xhtml('intro_search');
echo '</div>';
- $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&')));
- $form->addElement(form_makeTextField('q', $INPUT->str('q'), 'Search'));
- $form->addElement(form_makeButton('submit', '', 'Search'));
+ $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'class' => 'search'));
+ $form->addElement(form_makeTextField('q', $INPUT->str('q'), $this->getLang('search_for')));
+ $form->addElement(form_makeButton('submit', '', $this->getLang('search')));
$form->printForm();
if(!$INPUT->bool('q')) return;
@@ -123,7 +123,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
echo $this->locale_xhtml('intro_install');
echo '</div>';
- $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data'));
+ $form = new Doku_Form(array('action' => $this->tabURL('', array(), '&'), 'enctype' => 'multipart/form-data', 'class' => 'install'));
$form->addElement(form_makeTextField('installurl', '', 'Install from URL:', '', 'block'));
$form->addElement(form_makeFileField('installfile', 'Upload Extension:', '', 'block'));
$form->addElement(form_makeButton('submit', '', 'Install'));
@@ -165,13 +165,13 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin {
/**
* Create an URL inside the extension manager
*
- * @param string $tab tab to load, empty for current tab
- * @param array $params associative array of parameter to set
- * @param string $sep seperator to build the URL
+ * @param string $tab tab to load, empty for current tab
+ * @param array $params associative array of parameter to set
+ * @param string $sep seperator to build the URL
* @param bool $absolute create absolute URLs?
* @return string
*/
- public function tabURL($tab = '', $params = array(), $sep = '&amp;', $absolute=false) {
+ public function tabURL($tab = '', $params = array(), $sep = '&amp;', $absolute = false) {
global $ID;
global $INPUT;
diff --git a/lib/plugins/extension/images/icons.xcf b/lib/plugins/extension/images/icons.xcf
index a99747d81..ab69b3099 100644
--- a/lib/plugins/extension/images/icons.xcf
+++ b/lib/plugins/extension/images/icons.xcf
Binary files differ
diff --git a/lib/plugins/extension/images/plugin.png b/lib/plugins/extension/images/plugin.png
index b9133681f..e4a2d3be6 100644
--- a/lib/plugins/extension/images/plugin.png
+++ b/lib/plugins/extension/images/plugin.png
Binary files differ
diff --git a/lib/plugins/extension/images/template.png b/lib/plugins/extension/images/template.png
index 383c4d0a3..ee74bc1d5 100644
--- a/lib/plugins/extension/images/template.png
+++ b/lib/plugins/extension/images/template.png
Binary files differ
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index db1449ae0..11c5caa2b 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -29,6 +29,9 @@ $lang['btn_disable'] = 'Disable';
$lang['btn_install'] = 'Install';
$lang['btn_reinstall'] = 'Re-install';
+$lang['search_for'] = 'Search Extension:';
+$lang['search'] = 'Search';
+
$lang['extensionby'] = '<strong>%s</strong> by %s';
$lang['popularity'] = 'Popularity: %s';
$lang['homepage_link'] = 'Docs';
diff --git a/lib/plugins/extension/style.less b/lib/plugins/extension/style.less
index 4a036f067..e1a7a1d7b 100644
--- a/lib/plugins/extension/style.less
+++ b/lib/plugins/extension/style.less
@@ -38,8 +38,11 @@
}
}
+/**
+ * general styles
+ */
#extension__manager {
- /* tab layout - most of it is in the main template */
+ // tab layout - most of it is in the main template
ul.tabs li.active a {
background-color: @ini_background_alt;
border-bottom: solid 1px @ini_background_alt;
@@ -52,336 +55,232 @@
text-align: left;
overflow: hidden;
}
-}
-
-/* ------- FIXME everything below needs to be checked for usage ---------- */
-
-
-
-/*
- * general layout
- */
-#extension__manager h2 {
- margin-left: 0;
-}
-#extension__manager .panelHeader div.error {
- margin-top: 0;
- float: left;
-}
-[dir=rtl] #extension__manager .panelHeader div.error {
- float: right;
+ // message spacing
+ div.msg {
+ margin: 0.4em 0 0 0;
+ }
}
/*
- * search & url download forms
+ * extensions table
*/
-#extension__manager form.search,
-#extension__manager form.btn_reload {
- float: right;
-}
-[dir=rtl] #extension__manager form.search,
-[dir=rtl] #extension__manager form.btn_reload {
- float: left;
-}
-
-#extension__manager div.search form.search {
- float: none;
-}
-
-#extension__manager .tagcloud {
- width: 55%;
- float: left;
- margin: 0 0.5em 1em 0;
-}
-[dir=rtl] #extension__manager .tagcloud {
- float: right;
- margin: 0 0 1em .5em;
-}
-
-#extension__manager .tagcloud a.taglink {
- background-color: inherit;
-}
-
-#extension__manager div.search {
- width: 44%;
- float: left;
-}
-[dir=rtl] #extension__manager div.search {
- float: right;
-}
-
-#extension__manager fieldset {
- margin-top: 0.5em;
- width: auto;
-}
-
-#extension__manager fieldset p {
- margin: 0.5em;
- text-align: justify;
- font-size: 85%;
-}
-
-/* tag cloud */
-#extension__manager a.cl0 { font-size: 0.7em; }
-#extension__manager a.cl1 { font-size: 0.9em; }
-#extension__manager a.cl2 { font-size: 1em; }
-#extension__manager a.cl3 { font-size: 1.3em; }
-#extension__manager a.cl4 { font-size: 1.6em; }
-#extension__manager a.cl5 { font-size: 1.9em; }
+#extension__list {
+ ul.extensionList {
+ margin-left: 0;
+ margin-right: 0;
+ padding: 0;
+ list-style: none;
+ }
+ ul.extensionList li {
+ margin: 0 0 .5em;
+ padding: 0 0 .5em;
+ color: @ini_text;
+ border-bottom: 1px solid @ini_border;
+ overflow: hidden;
+ }
-#extension__manager .extensionList input.button {
- margin: 0 .3em .3em 0;
-}
-[dir=rtl] #extension__manager .extensionList input.button {
- margin: 0 0 .3em .3em;
+ input.button {
+ margin: 0 .3em .3em 0;
+ }
}
-/*
- * extensions table
+/**
+ * extension table left column
*/
-#extension__manager .extensionList {
- margin-left: 0;
- margin-right: 0;
- padding: 0;
- list-style: none;
-}
-
-#extension__manager .extensionList li {
- margin: 0 0 .5em;
- padding: 0 0 .5em;
- color: @ini_text;
- border-bottom: 1px solid @ini_border;
- overflow: hidden;
-}
-
-#extension__manager .legend {
+#extension__list .legend {
position: relative;
width: 75%;
float: left;
-}
-[dir=rtl] #extension__manager .legend {
- float: right;
-}
-#extension__manager .legend > div {
- padding: 0 .5em 0 132px;
- border-right: 1px solid @ini_background_alt;
- overflow: hidden;
-}
-[dir=rtl] #extension__manager .legend > div {
- padding: 0 132px 0 .5em;
- border-left: 1px solid @ini_background_alt;
- border-right-width: 0;
-}
-
-#extension__manager .enabled div.screenshot span {
- background: transparent url(images/enabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager .disabled div.screenshot span {
- background: transparent url(images/disabled.png) no-repeat 2px 2px;
-}
-
-#extension__manager .disabled .legend {
- opacity: 0.7;
-}
-
-#extension__manager div.screenshot img {
- width: 120px;
- height: 70px;
- border-radius: 12px;
- box-shadow: 2px 2px 2px #ccc;
-}
-
-#extension__manager .legend div.screenshot {
- margin-top: 4px;
- margin-left: -132px;
- max-width: 120px;
- float: left;
- position: relative;
-}
-[dir=rtl] #extension__manager .legend div.screenshot {
- margin-left: 0;
- margin-right: -132px;
- float: right;
-}
+ // padding
+ > div {
+ padding: 0 .5em 0 132px;
+ border-right: 1px solid @ini_background_alt;
+ overflow: hidden;
+ }
-#extension__manager .legend div.screenshot span {
- min-height: 24px;
- min-width: 24px;
- position: absolute;
- left: 0px;
- top: 0px;
-}
-[dir=rtl] #extension__manager .legend div.screenshot span {
- left: auto;
- right: 0;
-}
+ // screenshot
+ div.screenshot {
+ margin-top: 4px;
+ margin-left: -132px;
+ max-width: 120px;
+ float: left;
+ position: relative;
+
+ img {
+ width: 120px;
+ height: 70px;
+ border-radius: 5px;
+ box-shadow: 2px 2px 2px #666;
+ }
+
+ span {
+ min-height: 24px;
+ min-width: 24px;
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ }
+ }
-#extension__manager .legend h2 {
- width: 100%;
- float: right;
- margin: 0.2em 0 0.5em;
- font-size: 100%;
- font-weight: normal;
- border: none;
-}
-[dir=rtl] #extension__manager .legend h2 {
- float: left;
-}
+ // plugin headline
+ h2 {
+ width: 100%;
+ float: right;
+ margin: 0.2em 0 0.5em;
+ font-size: 100%;
+ font-weight: normal;
+ border: none;
+
+ strong {
+ font-size: 120%;
+ font-weight: bold;
+ vertical-align: baseline;
+ }
+ }
-#extension__manager .legend h2 strong {
- font-size: 120%;
- font-weight: bold;
- vertical-align: baseline;
-}
+ // description
+ p {
+ margin: 0 0 0.6em 0;
+ }
-#extension__manager .legend p {
- margin: 0 0 0.6em 0;
-}
+ // popularity bar
+ div.popularity {
+ background-color: @ini_background;
+ border: 1px solid silver;
+ height: .4em;
+ margin: 0 auto;
+ padding: 1px;
+ width: 5.5em;
+ position: absolute;
+ right: .5em;
+ top: 0.2em;
+
+ div {
+ background-color: @ini_border;
+ height: 100%;
+
+ span {
+ display: none;// @todo: hide accessibly
+ }
+ }
+ }
-#extension__manager .legend span.linkbar {
- font-size: 85%;
-}
+ // Docs, Bugs, Tags
+ span.linkbar {
+ font-size: 85%;
-#extension__manager .legend span.linkbar span.tags {
- padding-left: 18px;
- background: transparent url(images/tag.png) no-repeat 0 0;
-}
+ span.tags {
+ padding-left: 18px;
+ background: transparent url(images/tag.png) no-repeat 0 0;
+ }
+ }
+ // more info button
+ a.info {
+ background: transparent url(images/up.png) no-repeat 0 0;
+ border-width: 0;
+ height: 13px;
+ width: 13px;
+ text-indent: -9999px;
+ float: right;
+ margin: .5em 0 0;
+ overflow: hidden;
-#extension__manager .legend a.info {
- background: transparent url(images/up.png) no-repeat 0 0;
- border-width: 0;
- height: 13px;
- width: 13px;
- text-indent: -99999px;
- float: right;
- margin: .5em 0 0;
- overflow: hidden;
-}
-[dir=rtl] #extension__manager .legend a.info {
- float: left;
- margin: .5em 0 0;
-}
+ &.close {
+ background: transparent url(images/down.png) no-repeat 0 0;
+ }
+ }
-#extension__manager .legend a.info.close {
- background: transparent url(images/down.png) no-repeat 0 0;
+ // detailed info box
+ dl.details {
+ margin: 0.4em 0 0 0;
+ font-size: 85%;
+ border-top: 1px solid @ini_background_alt;
+ clear: both;
+
+ dt {
+ clear: left;
+ float: left;
+ width: 25%;
+ margin: 0;
+ text-align: right;
+ font-weight: normal;
+ padding: 0.2em 5px 0 0;
+ }
+
+ dd {
+ margin-left: 25%;
+ font-weight: bold;
+ padding: 0.2em 0 0 5px;
+
+ a {
+ font-weight: normal;
+ }
+ }
+ }
}
-#extension__manager .legend div.popularity {
- background-color: @ini_background;
- border: 1px solid silver;
- height: .4em;
- margin: 0 auto;
- padding: 1px;
- width: 5.5em;
- position: absolute;
- right: .5em;
- top: 0.2em;
-}
-[dir=rtl] #extension__manager .legend div.popularity {
- right: auto;
- left: .5em;
-}
+/*
+ * Enabled/Disabled overrides
+ */
+#extension__list {
+ .enabled div.screenshot span {
+ background: transparent url(images/enabled.png) no-repeat 2px 2px;
+ }
-#extension__manager .legend div.popularity div {
- background-color: @ini_border;
- height: 100%;
-}
+ .disabled div.screenshot span {
+ background: transparent url(images/disabled.png) no-repeat 2px 2px;
+ }
-#extension__manager .legend div.popularity div span {
- display: none;/* @todo: hide accessibly */
+ .disabled .legend {
+ opacity: 0.7;
+ }
}
+/**
+ * extension table right column
+ */
#extension__manager .actions {
padding: 0;
font-size: 95%;
width: 25%;
float: right;
text-align: right;
-}
-[dir=rtl] #extension__manager .actions {
- float: left;
- text-align: left;
-}
-#extension__manager .actions .version {
- display: block;
-}
+ .version {
+ display: block;
+ }
-#extension__manager .actions p {
- margin: 0.2em 0;
- text-align: center;
+ p {
+ margin: 0.2em 0;
+ text-align: center;
+ }
}
-/*
- * extensions table, detailed info box
+/**
+ * Search form
*/
-#extension__manager dl.details {
- margin: 0.4em 0 0 0;
- font-size: 85%;
- border-top: 1px solid @ini_background_alt;
- clear: both;
-}
-
-#extension__manager dl.details dt {
- clear: left;
- float: left;
- width: 25%;
- margin: 0;
- text-align: right;
- font-weight: normal;
- padding: 0.2em 5px 0 0;
-}
-[dir=rtl] #extension__manager dl.details dt {
- clear: right;
- float: right;
- text-align: left;
- padding: 0.2em 0 0 5px;
-}
-
-#extension__manager dl.details dd {
- margin-left: 25%;
- font-weight: bold;
- padding: 0.2em 0 0 5px;
-}
-[dir=rtl] #extension__manager dl.details dd {
- margin-left: 0;
- margin-right: 25%;
- padding: 0.2em 5px 0 0 ;
-}
-
-#extension__manager dl.details dd a {
- font-weight: normal;
-}
+#extension__manager form.search {
+ display: block;
+ margin-bottom: 2em;
-#extension__manager #info__popup {
- z-index: 20;
- overflow: hidden;
- opacity: 0.9;
- border: 1px solid @ini_border;
- background-color: @ini_border; /*background_other__;*/
- text-align: left;
- padding: 0.2em;
-}
-[dir=rtl] #extension__manager #info__popup {
- text-align: right;
-}
+ span {
+ font-weight: bold;
+ }
-#extension__manager div.msg {
- margin: 0.4em 0 0 0;
+ input.edit {
+ width: 25em;
+ }
}
-#extension__manager ul.tabs div.msg {
- display: inline;
- margin-left: 0.4em;
-}
-[dir=rtl] #extension__manager ul.tabs div.msg {
- margin-left: 0;
- margin-right: 0.4em;
+/**
+ * Install form
+ */
+#extension__manager form.install {
+ text-align: center;
+ display: block;
+ width: 60%;
}
-
-/* end admin plugin styles */
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 05:05:17 +0000