xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encore des alternatives Unicode aux icônes

Browse Source 
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/284
pull/291/head
Alexandre Alapetite 11 years ago
parent de4e9d5a85
commit 6236f2a803
16 changed files with 43 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      app/layout/aside_feed.phtml
  2. 8
      app/layout/aside_flux.phtml
  3. 16
      app/layout/header.phtml
  4. 2
      app/layout/layout.phtml
  5. 6
      app/layout/nav_entries.phtml
  6. 12
      app/layout/nav_menu.phtml
  7. 2
      app/views/configure/categorize.phtml
  8. 4
      app/views/configure/display.phtml
  9. 10
      app/views/configure/feed.phtml
  10. 2
      app/views/helpers/view/global_view.phtml
  11. 8
      app/views/helpers/view/normal_view.phtml
  12. 2
      public/install.php
  13. 3
      public/scripts/global_view.js
  14. 2
      public/scripts/main.js
  15. 1
      public/themes/default/global.css
  16. 1
      public/themes/flat-design/global.css

6
app/layout/aside_feed.phtml
Unescape View File

@ -7,9 +7,9 @@
<div class="dropdown">
<div id="dropdown-cat" class="dropdown-target"></div>
<a class="dropdown-toggle btn" href="#dropdown-cat"><i class="icon i_down"></i></a>
<a class="dropdown-toggle btn" href="#dropdown-cat"><i class="icon i_down">▽</i></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="dropdown-header"><?php echo Translate::t ('category'); ?></li>
@ -34,7 +34,7 @@
</li>
</ul>
</div>
<button class="btn" type="submit"><i class="icon i_add"></i></button>
<button class="btn" type="submit"><i class="icon i_add">✚</i></button>
</div>
</form></li>

8
app/layout/aside_flux.phtml
Unescape View File

@ -1,5 +1,5 @@
<div class="aside aside_flux" id="aside_flux">
<a class="toggle_aside" href="#close"><i class="icon i_close"></i></a>
<a class="toggle_aside" href="#close"><i class="icon i_close">❌</i></a>
<ul class="categories">
<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
@ -38,7 +38,7 @@
<?php $c_active = false; if ($this->get_c == $cat->id ()) { $c_active = true; } ?>
<div class="category stick<?php echo $c_active ? ' active' : ''; ?>">
<a data-unread="<?php echo $cat->nbNotRead (); ?>" class="btn<?php echo $c_active ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>"><?php echo $cat->name (); ?></a>
<a class="btn dropdown-toggle" href="#"><i class="icon <?php echo $c_active ? 'i_up' : 'i_down'; ?>"></i></a>
<a class="btn dropdown-toggle" href="#"><i class="icon <?php echo $c_active ? 'i_up' : 'i_down'; ?>"><?php echo $c_active ? '△' : '▽'; ?></i></a>
</div>
<ul class="feeds<?php echo $c_active ? ' active' : ''; ?>">
@ -49,7 +49,7 @@
<li id="f_<?php echo $feed_id; ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError () ? ' error' : ''; ?><?php echo $nbEntries == 0 ? ' empty' : ''; ?>">
<div class="dropdown">
<div class="dropdown-target"></div>
<a class="dropdown-toggle" data-fweb="<?php echo $feed->website (); ?>"><i class="icon i_configure"></i></a>
<a class="dropdown-toggle" data-fweb="<?php echo $feed->website (); ?>"><i class="icon i_configure">⚙</i></a>
<?php /* feed_config_template */ ?>
</div>
<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
@ -66,7 +66,7 @@
<script id="feed_config_template" type="text/html">
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="item"><a href="<?php echo _url ('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo Translate::t ('filter'); ?></a></li>
<li class="item"><a target="_blank" href="http://example.net/"><?php echo Translate::t ('see_website'); ?></a></li>
<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>

16
app/layout/header.phtml
Unescape View File

@ -1,9 +1,9 @@
<?php if (login_is_conf ($this->conf)) { ?>
<ul class="nav nav-head nav-login">
<?php if (!is_logged ()) { ?>
<li class="item"><i class="icon i_login"></i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a></li>
<li class="item"><i class="icon i_login">🔒</i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a></li>
<?php } else { ?>
<li class="item"><i class="icon i_logout"></i> <a class="signout" href="#"><?php echo Translate::t ('logout'); ?></a></li>
<li class="item"><i class="icon i_logout">🔓</i> <a class="signout" href="#"><?php echo Translate::t ('logout'); ?></a></li>
<?php } ?>
</ul>
<?php } ?>
@ -12,7 +12,7 @@
<div class="item title">
<h1>
<a href="<?php echo _url ('index', 'index'); ?>">
<img class="logo" width="32" height="32" src="<?php echo Url::display ('/themes/icons/icon-32.png'); ?>" alt="[logo]" />
<img class="logo" width="32" height="32" src="<?php echo Url::display ('/themes/icons/icon-32.png'); ?>" alt="⊚" />
<?php echo Configuration::title (); ?>
</a>
</h1>
@ -42,7 +42,7 @@
<input type="hidden" name="state" value="<?php echo $state; ?>" />
<?php } ?>
<button class="btn" type="submit"><i class="icon i_search"></i></button>
<button class="btn" type="submit"><i class="icon i_search">🔍</i></button>
</div>
</form>
<?php } ?>
@ -53,9 +53,9 @@
<div class="dropdown">
<div id="dropdown-configure" class="dropdown-target"></div>
<a class="btn dropdown-toggle" href="#dropdown-configure"><i class="icon i_configure"></i></a>
<a class="btn dropdown-toggle" href="#dropdown-configure"><i class="icon i_configure">⚙</i></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="dropdown-header"><?php echo Translate::t ('configuration'); ?></li>
<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Translate::t ('general_and_reading'); ?></a></li>
<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Translate::t ('shortcuts'); ?></a></li>
@ -64,7 +64,7 @@
<li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Translate::t ('logs'); ?></a></li>
<?php if (login_is_conf ($this->conf) && is_logged ()) { ?>
<li class="separator"></li>
<li class="item"><a class="signout" href="#"><i class="icon i_logout"></i> <?php echo Translate::t ('logout'); ?></a></li>
<li class="item"><a class="signout" href="#"><i class="icon i_logout">🔓</i> <?php echo Translate::t ('logout'); ?></a></li>
<?php } ?>
</ul>
</div>
@ -73,7 +73,7 @@
if (login_is_conf ($this->conf) && !is_logged ()) { ?>
<div class="item configure">
<i class="icon i_login"></i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a>
<i class="icon i_login">🔒</i> <a class="signin" href="#"><?php echo Translate::t ('login'); ?></a>
</div>
<?php } ?>
</div>

2
app/layout/layout.phtml
Unescape View File

@ -36,7 +36,7 @@
?>
<div class="notification <?php echo $this->notification['type']; ?>">
<?php echo $this->notification['content']; ?>
<a class="close" href=""><i class="icon i_close"></i></a>
<a class="close" href=""><i class="icon i_close">❌</i></a>
</div>
<?php } ?>
</body>

6
app/layout/nav_entries.phtml
Unescape View File

@ -1,5 +1,5 @@
<ul id="nav_entries">
<li class="item"><a class="previous_entry" href="#"><i class="icon i_prev"></i></a></li>
<li class="item"><a class="up" href="#"><i class="icon i_up"></i></a></li>
<li class="item"><a class="next_entry" href="#"><i class="icon i_next"></i></a></li>
<li class="item"><a class="previous_entry" href="#"><i class="icon i_prev">⏪</i></a></li>
<li class="item"><a class="up" href="#"><i class="icon i_up">△</i></a></li>
<li class="item"><a class="next_entry" href="#"><i class="icon i_next">⏩</i></a></li>
</ul>

12
app/layout/nav_menu.phtml
Unescape View File

@ -1,8 +1,8 @@
<div class="nav_menu">
<a class="btn toggle_aside" href="#aside_flux"><i class="icon i_category"></i></a>
<a class="btn toggle_aside" href="#aside_flux"><i class="icon i_category">☷</i></a>
<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><i class="icon i_refresh"></i></a>
<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><i class="icon i_refresh">↻</i></a>
<?php
$get = false;
@ -62,9 +62,9 @@
<div class="dropdown">
<div id="dropdown-read" class="dropdown-target"></div>
<a class="dropdown-toggle btn" href="#dropdown-read"><i class="icon i_down"></i></a>
<a class="dropdown-toggle btn" href="#dropdown-read"><i class="icon i_down">▽</i></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="item"><a href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li>
<li class="separator"></li>
@ -93,9 +93,9 @@
?>
<div class="dropdown" id="nav_menu_views">
<div id="dropdown-views" class="dropdown-target"></div>
<a class="dropdown-toggle btn" href="#dropdown-views"><?php echo Translate::t ('display'); ?> <i class="icon i_down"></i></a>
<a class="dropdown-toggle btn" href="#dropdown-views"><?php echo Translate::t ('display'); ?> <i class="icon i_down">▽</i></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<?php
$url_output = $url;

2
app/views/configure/categorize.phtml
Unescape View File

@ -22,7 +22,7 @@
(<?php echo Translate::t ('number_feeds', $cat->nbFeed ()); ?>)
<?php if ($cat->id () == $this->defaultCategory->id ()) { ?>
<i class="icon i_help"></i> <?php echo Translate::t ('can_not_be_deleted'); ?>
<i class="icon i_help">ⓘ</i> <?php echo Translate::t ('can_not_be_deleted'); ?>
<?php } ?>
<input type="hidden" name="ids[]" value="<?php echo $cat->id (); ?>" />

4
app/views/configure/display.phtml
Unescape View File

@ -56,7 +56,7 @@
<?php $token = $this->conf->token (); ?>
<div class="group-controls">
<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>"/>
<i class="icon i_help"></i> <?php echo Translate::t('explain_token', Url::display(null, 'html', true), $token); ?>
<i class="icon i_help">ⓘ</i> <?php echo Translate::t('explain_token', Url::display(null, 'html', true), $token); ?>
</div>
</div>
@ -208,7 +208,7 @@
<p><a class="btn" href="<?php echo _url('entry', 'optimize'); ?>">
<?php echo Translate::t('optimize_bdd'); ?>
</a></p>
<i class="icon i_help"></i> <?php echo Translate::t('optimize_todo_sometimes'); ?>
<i class="icon i_help">ⓘ</i> <?php echo Translate::t('optimize_todo_sometimes'); ?>
</div>
</div>

10
app/views/configure/feed.phtml
Unescape View File

@ -29,21 +29,21 @@
<label class="group-name"><?php echo Translate::t ('website_url'); ?></label>
<div class="group-controls">
<input type="text" name="website" id="website" value="<?php echo $this->flux->website (); ?>" />
<a target="_blank" href="<?php echo $this->flux->website (); ?>"><i class="icon i_link"></i></a>
<a target="_blank" href="<?php echo $this->flux->website (); ?>"><i class="icon i_link">↗</i></a>
</div>
</div>
<div class="form-group">
<label class="group-name"><?php echo Translate::t ('feed_url'); ?></label>
<div class="group-controls">
<input type="text" name="url" id="url" value="<?php echo $this->flux->url (); ?>" />
<a target="_blank" href="<?php echo $this->flux->url (); ?>"><i class="icon i_link"></i></a>
<a target="_blank" href="<?php echo $this->flux->url (); ?>"><i class="icon i_link">↗</i></a>
</div>
</div>
<div class="form-group">
<label class="group-name"></label>
<div class="group-controls">
<a class="btn" href="<?php echo _url ('feed', 'actualize', 'id', $this->flux->id ()); ?>">
<i class="icon i_refresh"></i> <?php echo Translate::t('actualize'); ?>
<i class="icon i_refresh">↻</i> <?php echo Translate::t('actualize'); ?>
</a>
</div>
</div>
@ -85,7 +85,7 @@
<label class="group-name" for="path_entries"><?php echo Translate::t ('css_path_on_website'); ?></label>
<div class="group-controls">
<input type="text" name="path_entries" id="path_entries" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Translate::t ('blank_to_disable'); ?>" />
<i class="icon i_help"></i> <?php echo Translate::t ('retrieve_truncated_feeds'); ?>
<i class="icon i_help">ⓘ</i> <?php echo Translate::t ('retrieve_truncated_feeds'); ?>
</div>
</div>
@ -94,7 +94,7 @@
<label class="group-name" for="http_user"><?php echo Translate::t ('http_username'); ?></label>
<div class="group-controls">
<input type="text" name="http_user" id="http_user" value="<?php echo $auth['username']; ?>" autocomplete="off" />
<i class="icon i_help"></i> <?php echo Translate::t ('access_protected_feeds'); ?>
<i class="icon i_help">ⓘ</i> <?php echo Translate::t ('access_protected_feeds'); ?>
</div>
<label class="group-name" for="http_pass"><?php echo Translate::t ('http_password'); ?></label>

2
app/views/helpers/view/global_view.phtml
Unescape View File

@ -32,5 +32,5 @@
<div id="overlay"></div>
<div id="panel"<?php echo $this->conf->displayPosts () === 'no' ? ' class="hide_posts"' : ''; ?>>
<a class="close" href="#"><i class="icon i_close"></i></a>
<a class="close" href="#"><i class="icon i_close">❌</i></a>
</div>

8
app/views/helpers/view/normal_view.phtml
Unescape View File

@ -97,10 +97,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
?>
<div class="dropdown">
<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
<i class="icon i_share"></i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
<i class="icon i_share">♺</i> <a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>"><?php echo Translate::t ('share'); ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<?php
$shaarli = $this->conf->urlShaarli ();
if ((!login_is_conf ($this->conf) || is_logged ()) && $shaarli) {
@ -141,9 +141,9 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
<li class="item">
<div class="dropdown">
<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
<i class="icon i_tag"></i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
<i class="icon i_tag">⚐</i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>"><?php echo Translate::t ('related_tags'); ?></a>
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close"> </a></li>
<li class="dropdown-close"><a href="#close">❌</a></li>
<?php foreach($tags as $tag) { ?>
<li class="item"><a href="<?php echo _url ('index', 'index', 'search', urlencode ('#' . $tag)); ?>"><?php echo $tag; ?></a></li>
<?php } ?>

2
public/install.php
Unescape View File

@ -505,7 +505,7 @@ function printStep2 () {
<!-- TODO: if no problem during version 0.6, remove for version 0.7 -->
<label class="group-name" for="base_url"><?php echo _t ('base_url'); ?></label>
<div class="group-controls">
<input type="text" id="base_url" name="base_url" value="<?php echo isset ($_SESSION['base_url']) ? $_SESSION['base_url'] : $url; ?>" /> <i class="icon i_help"></i> <?php echo _t ('do_not_change_if_doubt'); ?>
<input type="text" id="base_url" name="base_url" value="<?php echo isset ($_SESSION['base_url']) ? $_SESSION['base_url'] : $url; ?>" /> <i class="icon i_help">ⓘ</i> <?php echo _t ('do_not_change_if_doubt'); ?>
</div>
</div>

3
public/scripts/global_view.js
Unescape View File

@ -30,8 +30,7 @@ function load_panel(link) {
function init_close_panel() {
$("#panel .close").click(function () {
$("#panel").html('<a class="close" href="#"><i class="icon i_close"></i></a>');
$("#panel").html('<a class="close" href="#"><i class="icon i_close">❌</i></a>');
init_close_panel();
$("#panel").slideToggle();
$("#overlay").fadeOut();

2
public/scripts/main.js
Unescape View File

@ -288,7 +288,7 @@ function init_column_categories() {
return;
}
$('#aside_flux').on('click', '.category>a.dropdown-toggle', function () {
$(this).children().toggleClass("i_down").toggleClass("i_up");
$(this).children().toggleClass("i_down").toggleClass("i_up").text($(this).hasClass("i_up") ? "△" : "▽");
$(this).parent().next(".feeds").slideToggle();
return false;
});

1
public/themes/default/global.css
Unescape View File

@ -435,6 +435,7 @@ input, select, textarea {
display: inline;
}
.dropdown-close a {
font-size: 0;
position: fixed;
top: 0; bottom: 0;
left: 0; right: 0;

1
public/themes/flat-design/global.css
Unescape View File

@ -427,6 +427,7 @@ input, select, textarea {
display: inline;
}
.dropdown-close a {
font-size: 0;
position: fixed;
top: 0; bottom: 0;
left: 0; right: 0;

Write Preview
Loading…
Cancel
Save