diff options
| author |  Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-01-22 08:31:54 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-01-22 08:31:54 +0100 |
| commit | 963dd6d26077a3e6a316736ab5ba1befcb8ad97c (patch) | |
| tree | 3461fbe3ed64abb86dfc007cdd9fc8f875e53240 | |
| parent | dfaf1c451fa418b562aff40935d53a2128dc19a3 (diff) | |
! encoding problem 2
https://github.com/FreshRSS/FreshRSS/commit/964a768bc384425e45ae953bff0f6f757078e7d6#commitcomment-9385695
| -rw-r--r-- | app/layout/aside_feed.phtml | 10 | ||||
| -rw-r--r-- | p/scripts/main.js | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index d2612e751..a6d22f878 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -74,20 +74,20 @@ <script id="feed_config_template" type="text/html"> <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close">❌</a></li> - <li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('gen.action.filter'); ?></a></li> + <li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_------'); ?>"><?php echo _t('gen.action.filter'); ?></a></li> <?php if (FreshRSS_Auth::hasAccess()) { ?> - <li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('index.menu.stats'); ?></a></li> + <li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '------'); ?>"><?php echo _t('index.menu.stats'); ?></a></li> <?php } ?> <li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('gen.action.see_website'); ?></a></li> <?php if (FreshRSS_Auth::hasAccess()) { ?> <li class="separator"></li> - <li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.manage'); ?></a></li> - <li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li> + <li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '------'); ?>"><?php echo _t('gen.action.manage'); ?></a></li> + <li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '------'); ?>"><?php echo _t('gen.action.actualize'); ?></a></li> <li class="item"> <?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?> <button class="read_all as-link <?php echo $confirm; ?>" form="mark-read-aside" - formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>" + formaction="<?php echo _url('entry', 'read', 'get', 'f_------'); ?>" type="submit"><?php echo _t('gen.action.mark_read'); ?></button> </li> <?php } ?> diff --git a/p/scripts/main.js b/p/scripts/main.js index 0561097e5..1be75bb12 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -519,7 +519,7 @@ function init_column_categories() { if ($(this).nextAll('.dropdown-menu').length === 0) { var feed_id = $(this).closest('.item').attr('id').substr(2), feed_web = $(this).data('fweb'), - template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web); + template = $('#feed_config_template').html().replace(/------/g, feed_id).replace('http://example.net/', feed_web); $(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template); } }); |