diff --git a/PluginMarket.class.php b/PluginMarket.class.php
index 0199ccc53509fea60714129ba9af72ca40640fb1..b83527ecf270f7c6248ca569681f3f89e6020a86 100755
--- a/PluginMarket.class.php
+++ b/PluginMarket.class.php
@@ -55,6 +55,7 @@ class PluginMarket extends StudIPPlugin implements SystemPlugin, HomepagePlugin
public function initialize()
{
+ PageLayout::addSqueezePackage('lightbox');
$this->addStylesheet('assets/pluginmarket.less');
PageLayout::addHeadElement('link', array(
'rel' => 'alternate',
diff --git a/assets/pluginmarket.less b/assets/pluginmarket.less
index f89428a530e538c6521f6b13f73095b4fd1643cd..e523d57d2f0cab0169b7c665f60a33002195f13a 100755
--- a/assets/pluginmarket.less
+++ b/assets/pluginmarket.less
@@ -10,7 +10,7 @@
.flex-justify-content(center);
.flex-align-items(stretch);
- > .image {
+ .image {
padding: 5px;
border: 5px solid #eeeeee;
margin: 5px;
diff --git a/controllers/myplugins.php b/controllers/myplugins.php
index e4f87d4091f1fdbce0c44a79c895a85ecb4e56db..ca345e1bee93d412c7ea74f564270ef2a4656a36 100755
--- a/controllers/myplugins.php
+++ b/controllers/myplugins.php
@@ -167,4 +167,15 @@ class MypluginsController extends MarketController
$this->redirect('presenting/details/' . $this->release->plugin->getId());
}
+
+ public function delete_action($plugin_id) {
+ $this->marketplugin = MarketPlugin::find($plugin_id);
+ if (Request::submitted('delete') && $this->marketplugin->isWritable()) {
+ CSRFProtection::verifyUnsafeRequest();
+ $this->marketplugin->delete();
+ $this->redirect('myplugins/overview');
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/controllers/presenting.php b/controllers/presenting.php
index 6c8121df042d6eb038ac5fd2c8caa00983fb407a..720b3736952e47e942c11328bfed9898806f33a1 100755
--- a/controllers/presenting.php
+++ b/controllers/presenting.php
@@ -163,12 +163,14 @@ class PresentingController extends MarketController
public function details_action($plugin_id) {
Navigation::addItem('/pluginmarket/presenting/details', new AutoNavigation(_('Details'), $this->url_for('presenting/details/'.$plugin_id)));
$this->marketplugin = new MarketPlugin($plugin_id);
+
if (Request::isPost() && Request::submitted("delete_plugin") && $this->marketplugin->isRootable()) {
$this->marketplugin->delete();
PageLayout::postMessage(MessageBox::success(_("Plugin wurde gel�scht.")));
$this->redirect('presenting/overview');
return;
}
+
$this->marketplugin['rating'] = $this->marketplugin->calculateRating();
$this->marketplugin->store();
@@ -342,5 +344,4 @@ class PresentingController extends MarketController
}
-
}
diff --git a/controllers/update.php b/controllers/update.php
index f9a2425477f85176e136c5937445471ce519b327..8ff7d914ba85ae36de7651231fdcc85d41525b10 100755
--- a/controllers/update.php
+++ b/controllers/update.php
@@ -27,6 +27,26 @@ class UpdateController extends MarketController
$this->render_text("Insecure request.");
}
}
+
+ public function usage_action() {
+ $this->plugins = MarketPlugin::findManyByName(Request::getArray('plugins'));
+ $this->mostlikely = MarketPluginUsage::findOneBySQL('user_id = ? GROUP BY name ORDER BY count(*) DESC', array(User::findCurrent()->id))->name;
+ }
+
+ public function save_usage_action() {
+ // delete old usage
+ MarketPluginUsage::deleteBySQL('user_id = ? AND name = ?', array(User::findCurrent()->id, Request::get('tag')));
+
+ // create new usages
+ foreach (Request::getArray('plugins') as $pluginid) {
+ MarketPluginUsage::create(array(
+ 'plugin_id' => $pluginid,
+ 'user_id' => User::findCurrent()->id,
+ 'name' => Request::get('tag')
+ ));
+ $this->done++;
+ }
+ }
protected function verify_secret($secret)
{
diff --git a/plugin.manifest b/plugin.manifest
index 82fab953c930bf4caea7bc07ec6903504b3da7e2..01a4c73e6edfd25fda740945f5eb3a537aae179e 100755
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,4 +1,4 @@
pluginname=PluginMarktplatz
pluginclassname=PluginMarket
origin=studip
-version=1.0.14
+version=1.0.15
diff --git a/views/approving/review.php b/views/approving/review.php
index 345898d9c942e0c8b547a64bf8faa6248c9a190b..ca32a10c24b0d356ee703fdf2418d662c999847b 100755
--- a/views/approving/review.php
+++ b/views/approving/review.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('approving/approve/' . $marketplugin->getId()) ?>" method="post" class="studip_form">
+<form action="<?= $controller->url_for('approving/approve/' . $marketplugin->getId()) ?>" method="post" class="default">
<fieldset>
<legend>
<?= _("Review schreiben") ?>
diff --git a/views/myplugins/_edit_images.php b/views/myplugins/_edit_images.php
index 0394c8a211ea3c201efd9ff5965af3c1f903e032..1920a0a380607bb88dc58b86f99fb14a99f164fb 100755
--- a/views/myplugins/_edit_images.php
+++ b/views/myplugins/_edit_images.php
@@ -9,7 +9,9 @@
<li class="image">
<input type="checkbox" name="delete_image[]" value="<?= htmlReady($image->getId()) ?>" id="delete_image_<?= htmlReady($image->getId()) ?>">
<div>
- <img src="<?= htmlReady($image->getURL()) ?>" style="max-height: 150px;">
+ <a href="<?= htmlReady($image->getURL()) ?>" data-lightbox="plugin_gallery">
+ <img src="<?= htmlReady($image->getURL()) ?>" style="max-height: 150px;">
+ </a>
<input type="hidden" name="image_order[]" value="<?= htmlReady($image->getId()) ?>">
<label for="delete_image_<?= htmlReady($image->getId()) ?>">
<?= Assets::img("icons/20/blue/trash", array('style' => "cursor: pointer;")) ?>
diff --git a/views/myplugins/delete.php b/views/myplugins/delete.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc836ca852d9aee2453c43627a0c785028e021ff
--- /dev/null
+++ b/views/myplugins/delete.php
@@ -0,0 +1,8 @@
+<form method="post" action="<?= $controller->url_for('myplugins/delete/' . $marketplugin->getId()) ?>">
+ <?= CSRFProtection::tokenTag() ?>
+ <p><?= sprintf(_('Soll das Plugin %s wirklich unwiederruflich gel�scht werden?'), htmlReady($marketplugin->name)) ?></p>
+
+ <div data-dialog-button>
+ <?= \Studip\Button::create(_('Endg�ltig l�schen'), 'delete') ?>
+ </div>
+</form>
\ No newline at end of file
diff --git a/views/myplugins/edit.php b/views/myplugins/edit.php
index 5eddfbb17e2bec19f145012708e56fc7b8675ce1..f2f932d3f66f13a279f75c7f0962c4a38305c681 100755
--- a/views/myplugins/edit.php
+++ b/views/myplugins/edit.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" class="studip_form" enctype="multipart/form-data">
+<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" class="default" enctype="multipart/form-data">
<input type="hidden" name="id" value="<?= $marketplugin->getId() ?>">
<fieldset>
<legend>
diff --git a/views/myplugins/edit_images.php b/views/myplugins/edit_images.php
index 67da92a95093c36413cf9d4f1918237d92da391d..9d90bff9aaf57a35c2395255b4d0442b018ed52b 100755
--- a/views/myplugins/edit_images.php
+++ b/views/myplugins/edit_images.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" enctype="multipart/form-data" class="studip_form">
+<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" enctype="multipart/form-data" class="default">
<input type="hidden" name="id" value="<?= $marketplugin->getId() ?>">
<?= $this->render_partial("myplugins/_edit_images.php", compact("marketplugin")) ?>
diff --git a/views/myplugins/edit_release.php b/views/myplugins/edit_release.php
index ca916824a8a5e515a8889384eac8a178aa62ab9d..34b53071c921b428bd6b85171f701f5741fbf425 100755
--- a/views/myplugins/edit_release.php
+++ b/views/myplugins/edit_release.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('myplugins/save_release') ?>" method="post" class="studip_form" enctype="multipart/form-data">
+<form action="<?= $controller->url_for('myplugins/save_release') ?>" method="post" class="default" enctype="multipart/form-data">
<input type="hidden" name="id" value="<?= $release->getId() ?>">
<input type="hidden" name="plugin_id" value="<?= $marketplugin->getId() ?>">
<?= $this->render_partial("myplugins/_edit_release.php", array('release' => $release)) ?>
diff --git a/views/presenting/details.php b/views/presenting/details.php
index e40ed80bd7a6cf4ac192814a387cf63204d4cb0b..e79791bf06ca1da4ae967fb4905ec64c45683f93 100755
--- a/views/presenting/details.php
+++ b/views/presenting/details.php
@@ -30,7 +30,9 @@ if ($icon) {
<ol id="pluginmarket_galery_view" class="pluginmarket_galery">
<? foreach ($marketplugin->images as $image) : ?>
<div class="image">
- <img src="<?= htmlReady($image->getURL()) ?>">
+ <a href="<?= htmlReady($image->getURL()) ?>" data-lightbox="plugin_gallery">
+ <img src="<?= htmlReady($image->getURL()) ?>">
+ </a>
</div>
<? endforeach ?>
<? if ($marketplugin->isWritable()) : ?>
@@ -293,16 +295,11 @@ if ($icon) {
<div style="text-align: center">
<? if ($marketplugin->isWritable()) : ?>
+ <?= \Studip\LinkButton::create(_("Plugin l�schen"), PluginEngine::getURL($plugin, array(), 'myplugins/delete/' . $marketplugin->getId()), array('data-dialog' => 1)) ?>
<?= \Studip\LinkButton::create(_("bearbeiten"), PluginEngine::getURL($plugin, array(), "myplugins/edit/" . $marketplugin->getId()), array('data-dialog' => 1)) ?>
<?= \Studip\LinkButton::create(_("Release hinzuf�gen"), PluginEngine::getURL($plugin, array(), "myplugins/add_release/" . $marketplugin->getId()), array('data-dialog' => 1)) ?>
<? endif ?>
<? if ($marketplugin['user_id'] !== $GLOBALS['user']->id) : ?>
<?= \Studip\LinkButton::create(_("Plugin abonnieren"), PluginEngine::getURL($plugin, array(), "presenting/register_for_pluginnews/" . $marketplugin->getId()), array('title' => _("Neuigkeiten des Plugins per Nachricht bekommen."), 'data-dialog' => "1")) ?>
<? endif ?>
-<? if ($marketplugin->isRootable()) : ?>
- <form action="?" method="post" style="display: inline-block; margin: 0px;">
- <input type="hidden" name="plugin_id" value="<?= htmlReady($marketplugin->getId()) ?>">
- <?= \Studip\Button::create(_("L�schen"), "delete_plugin", array('onclick' => "return window.confirm('"._("Plugin wirklich unwiderrufbar l�schen?")."');")) ?>
- </form>
-<? endif ?>
</div>
diff --git a/views/presenting/follow_release.php b/views/presenting/follow_release.php
index 565ed67ef72748686961ec8adc94ad8a38bc20ab..748b46322af9ff5acee3ba7ec3f54bf9b829d6d1 100755
--- a/views/presenting/follow_release.php
+++ b/views/presenting/follow_release.php
@@ -1,7 +1,7 @@
<? foreach (PageLayout::getMessages() as $message) : ?>
<?= $message ?>
<? endforeach ?>
-<form action="<?= $controller->url_for('presenting/follow_release/' . $release->getId()) ?>" method="post" data-dialog class="studip_form">
+<form action="<?= $controller->url_for('presenting/follow_release/' . $release->getId()) ?>" method="post" data-dialog class="default">
<p class="info">
<?= _("Immer aktuell bleiben mit automatischen Updates! Sie finden in Ihrem eigenen Stud.IP in der Pluginverwaltung rechts neben dem Plugin ein Icon, das Sie zu einem Popup f�hrt. Geben Sie dort die unten stehende Download-URL ein und geben Sie hier die URL ein, die Sie danach dort in Ihrer Pluginverwaltung sehen. Sind beide Systeme korrekt konfiguriert, wird der Marktplatz dann eine jede neue Version dieses Releases automatisch in ihrem Stud.IP installieren.") ?>
</p>
diff --git a/views/presenting/propose_usage.php b/views/presenting/propose_usage.php
index 350adfae0fd88e0ca8a53ed83ccafe5730789456..a5a17c948b8ef803d76f66c4d285ab63f7bad305 100755
--- a/views/presenting/propose_usage.php
+++ b/views/presenting/propose_usage.php
@@ -1,4 +1,4 @@
-<form class="studip_form" method="post" action="<?= $controller->url_for('presenting/propose_usage/' . $plugin->id) ?>">
+<form class="default" method="post" action="<?= $controller->url_for('presenting/propose_usage/' . $plugin->id) ?>">
<fieldset>
<?= CSRFProtection::tokenTag(); ?>
<legend><?= sprintf(_('Pluginnutzung mitteilen f�r %s'), htmlReady($plugin->name)) ?></legend>
diff --git a/views/presenting/review.php b/views/presenting/review.php
index 0d01c936af856a2f40425a8085b6d3608e8f0f16..56a4421b57b634db6214d0c292025ff4958b90d3 100755
--- a/views/presenting/review.php
+++ b/views/presenting/review.php
@@ -1,4 +1,4 @@
-<form action="<?= $controller->url_for('presenting/save_review/' . $review['plugin_id']) ?>" method="post" class="studip_form">
+<form action="<?= $controller->url_for('presenting/save_review/' . $review['plugin_id']) ?>" method="post" class="default">
<fieldset>
<legend>
<?= _("Bewertung") ?>
diff --git a/views/tools/sidebar_graphics_generator.php b/views/tools/sidebar_graphics_generator.php
index 48093cdc339c929e9e205c6c24f4a58ab415e579..b9514828af773704b5f8560d557d2488f5d53a98 100755
--- a/views/tools/sidebar_graphics_generator.php
+++ b/views/tools/sidebar_graphics_generator.php
@@ -1,4 +1,4 @@
-<h2><?= _("Erstellen von Siderbar-Grafiken") ?></h2>
+<h2><?= _("Erstellen von Sidebar-Grafiken") ?></h2>
<table>
<tbody>
@@ -7,7 +7,7 @@
<td><input type="color" id="color" value="#24437c" onChange="STUDIP.SidebarGraphicsGenerator.drawImage();"></td>
</tr>
<tr>
- <td><label for="localicon"><?= _("Bilddatei (SVG, quadratisch, wei�)") ?></label></td>
+ <td><label for="localicon"><?= _("Bilddatei (SVG, quadratisch, weiß)") ?></label></td>
<td><input type="file" id="localicon" onChange="STUDIP.SidebarGraphicsGenerator.setFile(this); return false;"></td>
</tr>
<tr style="display: none;">
@@ -31,4 +31,4 @@
<?= Assets::img("icons/16/blue/download") ?>
<?= _("Speichern unter ...") ?>
</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/update/save_usage.php b/views/update/save_usage.php
new file mode 100644
index 0000000000000000000000000000000000000000..f0279c6dd8e778fa74bcdba0312d5fd81dbaa1e5
--- /dev/null
+++ b/views/update/save_usage.php
@@ -0,0 +1,3 @@
+<p>
+ <?= sprintf(_('%s Benutzungen eingetragen'), $done) ?>
+</p>
\ No newline at end of file
diff --git a/views/update/usage.php b/views/update/usage.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e31f3c74cace2b1d7403b544874be90e37a9aa3
--- /dev/null
+++ b/views/update/usage.php
@@ -0,0 +1,27 @@
+<form class="studip_form" method="post" action="<?= PluginEngine::getLink($plugin, array(), 'update/save_usage/') ?>">
+ <fieldset>
+ <legend>
+ <?= _('Pluginnutzung') ?>
+ </legend>
+
+ <fieldset>
+ <legend>
+ <?= _('Plugins') ?>
+ </legend>
+ <? foreach ($plugins as $plugin): ?>
+ <label>
+ <input type="checkbox" name="plugins[]" value="<?= $plugin->id ?>" checked>
+ <?= htmlReady($plugin->name); ?>
+ </label>
+ <? endforeach; ?>
+ </fieldset>
+
+ <label>
+ <?= _('In Benutzung bei') ?>
+ <input type="text" name="tag" value="<?= htmlReady($mostlikely) ?>">
+ </label>
+
+ <?= Studip\Button::create(_('Eintragen')) ?>
+ </fieldset>
+</form>
+