diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/i18n/he/admin.php | 2 | ||||
| -rw-r--r-- | app/views/configure/queries.phtml | 68 |
2 files changed, 33 insertions, 37 deletions
diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 4227fcc18..8aed4b2d1 100644 --- a/app/i18n/he/admin.php +++ b/app/i18n/he/admin.php @@ -134,7 +134,7 @@ return array( 'feed_per_category' => 'הזנות על פי קטגוריה', 'idle' => 'הזנות שלא עודכנו', 'main' => 'סטטיסטיקות ראשיות', - 'main_stream' => 'הזנה ראשית', + 'main_stream' => 'הזנה ראשית', 'no_idle' => 'אין הזנות מובטלות!', 'number_entries' => '%d מאמרים', 'percent_of_total' => '%% מסך הכל', diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index b79f5fe5a..76a5b734b 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -11,51 +11,47 @@ <?php foreach ($this->queries as $key => $query) { ?> <div class="form-group" id="query-group-<?= $key ?>" draggable="true"> - <label class="group-name" for="queries_<?= $key ?>_name"> - <?= _t('conf.query.number', $key + 1) ?> - </label> - - <div class="group-controls"> - <?= $query->getName() ?> - <a class="configure open-slider" href="<?= _url('configure', 'query', 'id', $key) ?>"><?= _i('configure') ?></a> - <input type="hidden" id="queries_<?= $key ?>_name" name="queries[<?= $key ?>][name]" value="<?= $query->getName() ?>"/> - <input type="hidden" id="queries_<?= $key ?>_url" name="queries[<?= $key ?>][url]" value="<?= $query->getUrl() ?>"/> - <input type="hidden" id="queries_<?= $key ?>_search" name="queries[<?= $key ?>][search]" value="<?= urlencode($query->getSearch()) ?>"/> - <input type="hidden" id="queries_<?= $key ?>_state" name="queries[<?= $key ?>][state]" value="<?= $query->getState() ?>"/> - <input type="hidden" id="queries_<?= $key ?>_order" name="queries[<?= $key ?>][order]" value="<?= $query->getOrder() ?>"/> - <input type="hidden" id="queries_<?= $key ?>_get" name="queries[<?= $key ?>][get]" value="<?= $query->getGet() ?>"/> - + <div class="box"> + <div class="box-title"> + <a class="configure open-slider" href="<?= _url('configure', 'query', 'id', $key) ?>"><?= _i('configure') ?></a><?= $query->getName() ?> + <input type="hidden" id="queries_<?= $key ?>_name" name="queries[<?= $key ?>][name]" value="<?= $query->getName() ?>"/> + <input type="hidden" id="queries_<?= $key ?>_url" name="queries[<?= $key ?>][url]" value="<?= $query->getUrl() ?>"/> + <input type="hidden" id="queries_<?= $key ?>_search" name="queries[<?= $key ?>][search]" value="<?= urlencode($query->getSearch()) ?>"/> + <input type="hidden" id="queries_<?= $key ?>_state" name="queries[<?= $key ?>][state]" value="<?= $query->getState() ?>"/> + <input type="hidden" id="queries_<?= $key ?>_order" name="queries[<?= $key ?>][order]" value="<?= $query->getOrder() ?>"/> + <input type="hidden" id="queries_<?= $key ?>_get" name="queries[<?= $key ?>][get]" value="<?= $query->getGet() ?>"/> + </div> <?php if (!$query->hasParameters()) { ?> - <div class="alert alert-warn"> - <div class="alert-head"><?= _t('conf.query.no_filter') ?></div> + <div class="box-content"> + <div class="alert alert-warn"> + <div class="alert-head"><?= _t('conf.query.no_filter') ?></div> + </div> </div> <?php } elseif ($query->isDeprecated()) { ?> - <div class="alert alert-error"> - <div class="alert-head"><?= _t('conf.query.deprecated') ?></div> + <div class="box-content"> + <div class="alert alert-error"> + <div class="alert-head"><?= _t('conf.query.deprecated') ?></div> + </div> </div> <?php } else { ?> - <div class="alert alert-success"> - <div class="alert-head"><?= _t('conf.query.filter') ?></div> + <ul class="box-content"> + <?php if ($query->hasSearch()) { ?> + <li class="item"><?= _t('conf.query.search', htmlspecialchars($query->getSearch()->getRawInput(), ENT_NOQUOTES, 'UTF-8')) ?></li> + <?php } ?> - <ul> - <?php if ($query->hasSearch()) { ?> - <li class="item"><?= _t('conf.query.search', htmlspecialchars($query->getSearch()->getRawInput(), ENT_NOQUOTES, 'UTF-8')) ?></li> - <?php } ?> + <?php if ($query->getState()) { ?> + <li class="item"><?= _t('conf.query.state_' . $query->getState()) ?></li> + <?php } ?> - <?php if ($query->getState()) { ?> - <li class="item"><?= _t('conf.query.state_' . $query->getState()) ?></li> - <?php } ?> + <?php if ($query->getOrder()) { ?> + <li class="item"><?= _t('conf.query.order_' . strtolower($query->getOrder())) ?></li> + <?php } ?> - <?php if ($query->getOrder()) { ?> - <li class="item"><?= _t('conf.query.order_' . strtolower($query->getOrder())) ?></li> - <?php } ?> - - <?php if ($query->getGet()) { ?> - <li class="item"><?= _t('conf.query.get_' . $query->getGetType(), $query->getGetName()) ?></li> - <?php } ?> + <?php if ($query->getGet()) { ?> + <li class="item"><?= _t('conf.query.get_' . $query->getGetType(), $query->getGetName()) ?></li> + <?php } ?> + <?php } ?> </ul> - </div> - <?php } ?> </div> </div> <?php } ?> |