diff --git a/views/approving/overview.php b/views/approving/overview.php index 9552cfaa2bd0bc7b9d5871f719f4b05f8fad8ac3..ecd3ac431fb5a3a03f72d8bde22ea3c39b6c518d 100755 --- a/views/approving/overview.php +++ b/views/approving/overview.php @@ -26,7 +26,7 @@ </td> <td class="actions"> <a href="<?= $controller->url_for('approving/review/' . $marketplugin->getId()) ?>" data-dialog> - <?= Assets::img("icons/20/blue/assessment") ?> + <?= Icon::create('assessment') ?> </a> </td> </tr> diff --git a/views/myplugins/_edit_images.php b/views/myplugins/_edit_images.php index 1920a0a380607bb88dc58b86f99fb14a99f164fb..d6c0d285022bb5eb68d18d1ab5916adf274548c5 100755 --- a/views/myplugins/_edit_images.php +++ b/views/myplugins/_edit_images.php @@ -5,23 +5,24 @@ </legend> <ol id="galery_edit" class="pluginmarket_galery"> - <? foreach ($marketplugin->images as $image) : ?> - <li class="image"> - <input type="checkbox" name="delete_image[]" value="<?= htmlReady($image->getId()) ?>" id="delete_image_<?= htmlReady($image->getId()) ?>"> - <div> - <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;")) ?> - </label> - </div> - </li> - <? endforeach ?> + <? foreach ($marketplugin->images as $image) : ?> + <li class="image"> + <input type="checkbox" name="delete_image[]" value="<?= htmlReady($image->getId()) ?>" + id="delete_image_<?= htmlReady($image->getId()) ?>"> + <div> + <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()) ?>"> + <?= Icon::create('trash', 'clickable', ['style' => "cursor: pointer;"]) ?> + </label> + </div> + </li> + <? endforeach ?> </ol> <script> - jQuery(function() { + jQuery(function () { jQuery("#galery_edit").sortable(); }); </script> @@ -29,11 +30,12 @@ <div id="new_image_container"> <div> <label> - <?= Assets::img("icons/20/blue/upload", array('class' => "text-bottom", 'style' => "cursor: pointer;")) ?> + <?= Icon::create('upload', 'clickable', ['class' => "text-bottom", 'style' => "cursor: pointer;"]) ?> <input type="file" name="new_images[]"> </label> - <a href="#" onClick="if (jQuery('#new_image_container > div').length > 1) jQuery(this).closest('div').remove(); else jQuery(this).closest('div').find('input[type=file]').val(''); return false;"><?= Assets::img("icons/20/blue/trash") ?></a> + <a href="#" + onClick="if (jQuery('#new_image_container > div').length > 1) jQuery(this).closest('div').remove(); else jQuery(this).closest('div').find('input[type=file]').val(''); return false;"><?= Icon::create('trash') ?></a> </div> </div> - <?= \Studip\LinkButton::create(_("Weiteres Bild"), "#", array('onClick' => "jQuery('#new_image_container > div').first().clone().appendTo('#new_image_container').find('input[type=file]').val(''); return false;")) ?> + <?= \Studip\LinkButton::create(_("Weiteres Bild"), "#", ['onClick' => "jQuery('#new_image_container > div').first().clone().appendTo('#new_image_container').find('input[type=file]').val(''); return false;"]) ?> </fieldset> \ No newline at end of file diff --git a/views/myplugins/_edit_release.php b/views/myplugins/_edit_release.php index 7bf2bba58d75b2c7a95e13e0652f0352de45f8f5..29ade294d0052b56c80e82a66785e1a2e1e2cf2d 100755 --- a/views/myplugins/_edit_release.php +++ b/views/myplugins/_edit_release.php @@ -24,7 +24,7 @@ </legend> <label> <a style="cursor: pointer"> - <?= Assets::img("icons/20/blue/upload") ?> + <?= Icon::create('upload') ?> <input type="file" name="release_file"> </a> </label> diff --git a/views/myplugins/overview.php b/views/myplugins/overview.php index 4beadd2693387763c58c6198533b6696def9b490..33461be1cc61964fcf1177047c38ebae9c6ca42a 100755 --- a/views/myplugins/overview.php +++ b/views/myplugins/overview.php @@ -8,48 +8,51 @@ </tr> </thead> <tbody> -<? if (count($plugins)): ?> - <? foreach ($plugins as $marketplugin): ?> - <tr> - <td> - <? if ($marketplugin['publiclyvisible'] && !$marketplugin['approved']) : ?> - <?= Assets::img("icons/20/red/exclaim-circle", array('title' => _("Plugin wurde noch nicht von einem Administrator freigeschaltet."), 'class' => "text-bottom")) ?> - <? endif; ?> - <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>"> - <?= htmlReady($marketplugin['name']) ?> - </a> - </td> - <td> - <? - $chdate = $marketplugin['chdate']; - foreach ($marketplugin->releases as $release) { - $chdate = max($chdate, $release['chdate']); - } - ?> - <?= date("j.n.Y, G:i", $chdate) ?> <?= _("Uhr") ?> - </td> - <td> - <? if (!$marketplugin['publiclyvisible']) : ?> - <?= Assets::img("icons/20/grey/lock-locked.png.png", array('title' => _("Plugin ist nicht �ffentlich"))) ?> - <? endif ?> - </td> - <td class="actions"> - <a href="<?= $controller->url_for('myplugins/edit/' . $marketplugin->getId()) ?>" data-dialog title="<?= _("Plugin-Info bearbeiten") ?>"> - <?= Assets::img('icons/20/blue/edit') ?> - </a> - <a href="<?= $controller->url_for('myplugins/add_release/' . $marketplugin->getId()) ?>" data-dialog title="<?= _("Neues Release hinzuf�gen") ?>"> - <?= Assets::img("icons/20/blue/add") ?> - </a> - </td> - </tr> - <? endforeach; ?> -<? else: ?> - <tr> - <td colspan="4" style="text-align: center;"> - <?= _("Sie haben noch kein Plugin eingestellt.") ?> - </td> - </tr> -<? endif; ?> + <? if (count($plugins)): ?> + <? foreach ($plugins as $marketplugin): ?> + <tr> + <td> + <? if ($marketplugin['publiclyvisible'] && !$marketplugin['approved']) : ?> + <?= Icon::create('exclaim-circle', 'status-red', ['title' => _("Plugin wurde noch nicht von einem Administrator freigeschaltet."), + 'class' => "text-bottom"]) ?> + <? endif; ?> + <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>"> + <?= htmlReady($marketplugin['name']) ?> + </a> + </td> + <td> + <? + $chdate = $marketplugin['chdate']; + foreach ($marketplugin->releases as $release) { + $chdate = max($chdate, $release['chdate']); + } + ?> + <?= date("j.n.Y, G:i", $chdate) ?> <?= _("Uhr") ?> + </td> + <td> + <? if (!$marketplugin['publiclyvisible']) : ?> + <?= Icon::create('lock-locked', 'inactive', ['title' => _("Plugin ist nicht �ffentlich")]) ?> + <? endif ?> + </td> + <td class="actions"> + <a href="<?= $controller->url_for('myplugins/edit/' . $marketplugin->getId()) ?>" data-dialog + title="<?= _("Plugin-Info bearbeiten") ?>"> + <?= Icon::create('edit') ?> + </a> + <a href="<?= $controller->url_for('myplugins/add_release/' . $marketplugin->getId()) ?>" + data-dialog title="<?= _("Neues Release hinzuf�gen") ?>"> + <?= Icon::create('add') ?> + </a> + </td> + </tr> + <? endforeach; ?> + <? else: ?> + <tr> + <td colspan="4" style="text-align: center;"> + <?= _("Sie haben noch kein Plugin eingestellt.") ?> + </td> + </tr> + <? endif; ?> </tbody> </table> @@ -58,7 +61,7 @@ $sidebar = Sidebar::Get(); $sidebar->setImage(Assets::image_path("sidebar/plugin-sidebar.png")); $actions = new ActionsWidget(); $actions->addLink(_("Neues Plugin eintragen"), - $controller->url_for('myplugins/add'), - 'icons/16/blue/add.png')->asDialog(); + $controller->url_for('myplugins/add'), + Icon::create('add'))->asDialog(); $sidebar->addWidget($actions); diff --git a/views/presenting/overview_list.php b/views/presenting/overview_list.php index 6287307741be273b81bf4a1976ed41d0a26e828c..68bf9a1e8ba17c0f20ac047fea591820db4e4583 100755 --- a/views/presenting/overview_list.php +++ b/views/presenting/overview_list.php @@ -40,18 +40,18 @@ </td> <? $score = $marketplugin['rating'] ?> <? $score = round($score, 1) / 2 ?> - <td data-sort="<?=$score?>"> + <td data-sort="<?= $score ?>"> <span class="starscore"> <? $v = $score >= 1 ? 3 : ($score >= 0.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score >= 2 ? 3 : ($score >= 1.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score >= 3 ? 3 : ($score >= 2.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px') ?> <? $v = $score >= 4 ? 3 : ($score >= 3.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px') ?> <? $v = $score > 4.5 ? 3 : ($score >= 4.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> </span> </td> </tr> diff --git a/views/presenting/users_plugins.php b/views/presenting/users_plugins.php index fd9b3f464ff2a8481ea9b50b962e66dc51c6c3b1..2c712d82da0b89590bd1cd612e84962c93d3c2c6 100755 --- a/views/presenting/users_plugins.php +++ b/views/presenting/users_plugins.php @@ -1,38 +1,38 @@ <table class="default"> -<? foreach ($plugins as $marketplugin): ?> - <tr> - <td> - <a href="<?= PluginEngine::getLink($plugin, array(), 'presenting/details/' . $marketplugin->getId()) ?>"> - <?= htmlReady($marketplugin['name']) ?> - </a> - </td> - <td> - <? $score = $marketplugin['rating'] ?> - <? $score = round($score, 1) / 2 ?> - <span class="starscore"> + <? foreach ($plugins as $marketplugin): ?> + <tr> + <td> + <a href="<?= PluginEngine::getLink($plugin, [], 'presenting/details/' . $marketplugin->getId()) ?>"> + <?= htmlReady($marketplugin['name']) ?> + </a> + </td> + <td> + <? $score = $marketplugin['rating'] ?> + <? $score = round($score, 1) / 2 ?> + <span class="starscore"> <? $v = $score >= 1 ? 3 : ($score >= 0.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score >= 2 ? 3 : ($score >= 1.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score >= 3 ? 3 : ($score >= 2.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score >= 4 ? 3 : ($score >= 3.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> <? $v = $score > 4.5 ? 3 : ($score >= 4.5 ? 2 : "") ?> - <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "16px", 'class' => "big-image-handled")) ?> + <?= Icon::create($plugin->getPluginURL() . "/assets/star$v.svg")->asImg('16px')?> </span> - </td> - <td> - <div style="max-height: 20px; overflow: hidden;"> - <? foreach ($marketplugin->getTags() as $key => $tag): ?> - <?= $key > 0 ? "," : "" ?> - <a href="<?= PluginEngine::getLink($plugin, compact('tag'), 'presenting/all') ?>"> - <?= Assets::img("icons/16/blue/tag", array('class' => "text-bottom")) ?> - <?= htmlReady(ucwords($tag)) ?> - </a> - <? endforeach; ?> - </div> - </td> - </tr> -<? endforeach; ?> + </td> + <td> + <div style="max-height: 20px; overflow: hidden;"> + <? foreach ($marketplugin->getTags() as $key => $tag): ?> + <?= $key > 0 ? "," : "" ?> + <a href="<?= PluginEngine::getLink($plugin, compact('tag'), 'presenting/all') ?>"> + <?= Icon::create("tag", 'clickable', ['class' => "text-bottom"]) ?> + <?= htmlReady(ucwords($tag)) ?> + </a> + <? endforeach; ?> + </div> + </td> + </tr> + <? endforeach; ?> </table> \ No newline at end of file diff --git a/views/tools/sidebar_graphics_generator.php b/views/tools/sidebar_graphics_generator.php index b9514828af773704b5f8560d557d2488f5d53a98..0e0450fb9b0dde36fa24b6f53d45121629b88db1 100755 --- a/views/tools/sidebar_graphics_generator.php +++ b/views/tools/sidebar_graphics_generator.php @@ -28,7 +28,7 @@ <div id="save_instructions" style="display: none; padding: 20px;"> <a href="#" id="downloader" onClick="this.href=window.document.getElementById('sidebar_image').toDataURL('image/png');" download="testXXX.png"> - <?= Assets::img("icons/16/blue/download") ?> + <?= Icon::create("icons/16/blue/download") ?> <?= _("Speichern unter ...") ?> </a> </div>