<div class="shaarli-menu pure-g" id="shaarli-menu">
<div class="pure-u-lg-0 pure-u-1">
<div class="pure-menu">
- <!-- FIXME! default value in PHP -->
- <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
- class="pure-menu-link">
+ <a href="{$titleLink}" class="pure-menu-link">
<i class="fa fa-home"></i>
+ {$shaarlititle}
</a>
<a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
</div>
</div>
<div class="pure-u-1">
- <div class="pure-menu menu-transform pure-menu-horizontal">
- <ul class="pure-menu-list">
- <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible">
- <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
- class="pure-menu-link">
- <i class="fa fa-home"></i>
+ <div class="pure-menu menu-transform pure-menu-horizontal pure-g">
+ <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1">
+ <li class="pure-menu-item pure-u-0 pure-u-lg-visible">
+ <a href="{$titleLink}" class="pure-menu-link">
+ <img src="img/icon.png" width="16" height="16" class="head-logo" />
+ {$shaarlititle}
</a>
</li>
- {if="isLoggedIn()"}
- <li class="pure-menu-item">
- <a href="?do=addlink" class="pure-menu-link">Shaare</a>
- </li>
- <li class="pure-menu-item">
- <a href="?do=tools" class="pure-menu-link">Tools</a>
- </li>
-
- {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+ {if="isLoggedIn() || $openshaarli"}
<li class="pure-menu-item">
- <a href="?do=addlink" class="pure-menu-link">Shaare</a>
+ <a href="?do=addlink" class="pure-menu-link">
+ <i class="fa fa-plus" ></i> {'Shaare'|t}
+ </a>
</li>
<li class="pure-menu-item">
- <a href="?do=tools" class="pure-menu-link">Tools</a>
- </li>
- {else}
- <li class="pure-menu-item">
- <a href="?do=login" class="pure-menu-link">Login</a>
+ <a href="?do=tools" class="pure-menu-link">{'Tools'|t}</a>
</li>
{/if}
<li class="pure-menu-item">
- <a href="{$feedurl}?do=rss{$searchcrits}" class="pure-menu-link">RSS Feed</a>
- </li>
- {if="$GLOBALS['config']['SHOW_ATOM']"}
- <li class="pure-menu-item">
- <a href="{$feedurl}?do=atom{$searchcrits}" class="pure-menu-link">ATOM Feed</a>
- </li>
- {/if}
- <li class="pure-menu-item">
- <a href="?do=tagcloud" class="pure-menu-link">Tag cloud</a>
+ <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a>
</li>
<li class="pure-menu-item">
- <a href="?do=picwall{$searchcrits}" class="pure-menu-link">Picture wall</a>
+ <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a>
</li>
<li class="pure-menu-item">
- <a href="?do=daily" class="pure-menu-link">Daily</a>
+ <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a>
</li>
- <!-- FIXME! update plugin system to handle this -->
{loop="$plugins_header.buttons_toolbar"}
<li class="pure-menu-item">
- <a href="{$value.url}" class="pure-menu-link">{$value.title}</a>
+ <a
+ {$value.attr.class=isset($value.class) ? $value.attr.class . ' pure-menu-link' : 'pure-menu-link'}
+ {loop="$value.attr"}
+ {$key}="{$value}"
+ {/loop}>
+ {$value.html}
+ </a>
</li>
{/loop}
+ <li class="pure-menu-item pure-u-lg-0">
+ <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
+ </li>
{if="isLoggedIn()"}
- <li class="pure-menu-item">
- <a href="?do=logout" class="pure-menu-link">Logout</a>
+ <li class="pure-menu-item pure-u-lg-0">
+ <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a>
</li>
{else}
- <li class="pure-menu-item">
- <a href="?do=login" class="pure-menu-link">Login</a>
+ <li class="pure-menu-item pure-u-lg-0">
+ <a href="?do=login" class="pure-menu-link">{'Login'|t}</a>
</li>
{/if}
</ul>
+ <div class="header-buttons pure-u-lg-1-6 pure-u-0 pure-u-lg-visible">
+ <ul class="pure-menu-list">
+ <li class="pure-menu-item">
+ <a href="#" class="pure-menu-link subheader-opener"
+ data-open-id="search"
+ id="search-button" title="{'Search'|t}">
+ <i class="fa fa-search"></i>
+ </a>
+ </li>
+ <li class="pure-menu-item">
+ <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}">
+ <i class="fa fa-rss"></i>
+ </a>
+ </li>
+ {if="!isLoggedIn()"}
+ <li class="pure-menu-item">
+ <a href="?do=login" class="pure-menu-link subheader-opener"
+ data-open-id="header-login-form"
+ id="login-button" title="{'Login'|t}">
+ <i class="fa fa-user"></i>
+ </a>
+ </li>
+ {else}
+ <li class="pure-menu-item">
+ <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}">
+ <i class="fa fa-sign-out"></i>
+ </a>
+ </li>
+ {/if}
+ </ul>
+ </div>
</div>
</div>
</div>
-<div id="header" class="pure-u-0 pure-u-lg-visible">
- <h1 id="header-title">
- <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}">
- {$GLOBALS['title']}
- </a>
- </h1>
- <div id="linkcount">
- {if="!empty($linkcount)"}<span class="strong">{$linkcount}</span> shaares{/if}
+<div id="content">
+ <div id="search" class="subheader-form">
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-1-2">
+ <form method="GET" class="searchform" name="searchform">
+ <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="{'Search text'|t}"
+ {if="!empty($search_term)"}
+ value="{$search_term}"
+ {/if}
+ >
+ <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+ </form>
+ </div>
+ <div class="pure-u-1 pure-u-lg-1-2">
+ <form method="GET" class="tagfilter" name="tagfilter">
+ <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="{'Filter by tag'|t}"
+ {if="!empty($search_tags)"}
+ value="{$search_tags}"
+ {/if}
+ autocomplete="off" data-multiple data-minChars="1"
+ data-list="{loop="$tags"}{$key}, {/loop}"
+ >
+ <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+ </form>
+ </div>
+ </div>
</div>
-
- <div id="search">
- <form method="GET" class="searchform" name="searchform">
- <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
- {if="!empty($search_crits) && $search_type=='fulltext'"}
- value="{$search_crits}"
- {/if}
- >
- <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
- </form>
- <form method="GET" class="tagfilter" name="tagfilter">
- <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
- {if="!empty($search_crits) && $search_type=='tags'"}
- value="{function="implode(' ', $search_crits)"}"
- {/if}
- autocomplete="off" data-multiple data-minChars="1"
- data-list="{loop="$tags"}{$key}, {/loop}"
- >
- <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
+ {if="!isLoggedIn()"}
+ <form method="post" name="loginform">
+ <div class="subheader-form" id="header-login-form">
+ <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
+ <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
+ <div class="remember-me">
+ <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6" checked>
+ <label for="longlastingsession">{'Remember me'|t}</label>
+ </div>
+ <input type="hidden" name="token" value="{$token}">
+ <input type="hidden" name="returnurl">
+ <input type="submit" value="Login" tabindex="7">
+ </div>
</form>
+ {/if}
+{if="!empty($newVersion) || !empty($versionError)"}
+ <div class="pure-g new-version-message pure-alert pure-alert-warning pure-alert-closable">
+ <div class="pure-u-2-24"></div>
+ {if="$newVersion"}
+ <div class="pure-u-20-24">
+ Shaarli {$newVersion}
+ <a href="https://github.com/shaarli/Shaarli/releases">{'is available'|t}</a>.
+ </div>
+ {/if}
+ {if="$versionError"}
+ <div class="pure-u-20-24">
+ {'Error'|t}: {$versionError}
+ </div>
+ {/if}
+ <div class="pure-u-2-24">
+ <i id="new-version-dismiss" class="fa fa-times pure-alert-close"></i>
+ </div>
</div>
-</div>
-
-<div id="content">
-
-
-{if="!empty($_GET['source']) && $_GET['source']=='bookmarklet'"}
- {ignore} When called as a popup from bookmarklet, do not display menu. {/ignore}
-{else}
-
{/if}
-
{if="!empty($plugin_errors) && isLoggedIn()"}
- <ul class="errors">
+ <div class="pure-g new-version-message pure-alert pure-alert-error pure-alert-closable">
+ <div class="pure-u-2-24"></div>
+ <div class="pure-u-20-24">
{loop="plugin_errors"}
- <li>{$value}</li>
+ <p>{$value}</p>
{/loop}
- </ul>
+ </div>
+ <div class="pure-u-2-24">
+ <i class="fa fa-times pure-alert-close"></i>
+ </div>
+ </div>
{/if}
-<div class="clear"></div>
+
<div class="clear"></div>
projects / github / shaarli / Shaarli.git / blobdiff