Commit 512f32d7 authored by  JosephK's avatar JosephK

screen et btn sur l'accueil + tags, filtres et liens par défaut + divers ajustements

parent a1917246
......@@ -113,6 +113,7 @@ function create_account($account, $password, $email) {
chmod('u/' . $account . '/' . $file , 0755);
copy('shaarli/' . $file . '/.htaccess', 'u/' . $account . '/' . $file . '/.htaccess');
copy('shaarli/plugins/tags_advanced/example.php', 'u/' . $account . '/data/tags_advanced.php');
copy('shaarli/plugins/myframa/datastore.php', 'u/' . $account . '/data/datastore.php');
}
//--Config writing (from shaarli/index.php install() )--------------
$GLOBALS['timezone'] = 'Europe/Paris'; // There is no reliable way to guess timezone so we force Paris.;
......
......@@ -26,8 +26,40 @@
<hr class="trait" role="presentation" />
</header>';
$choose1 = '
<script type="text/javascript">
jQuery(document).ready(function() {
jQuery(\'#choose .btn-success\').on(\'click\', function() {
jQuery(\'#login\').hide();
jQuery(\'#registration\').slideDown();
});
jQuery(\'#choose .btn-primary\').on(\'click\', function() {
jQuery(\'#registration\').hide();
jQuery(\'#login\').slideDown();
});
jQuery(\'#registration, #login\').hide();
});
</script>
<div class="row" id="choose">
<div class="col-md-12">
<p class="text-center"><img src="shaarli/plugins/myframa/screen.jpg" alt="" class="ombre" /></p>
<br>
<p class="col-sm-6 text-center">
<a href="javascript:void(0)" class="btn btn-success btn-lg">
<i class="fa fa-fw fa-user"></i> '.t('Create an account').'
</a>
</p>
<p class="col-sm-6 text-center">
<a href="javascript:void(0)" class="btn btn-primary btn-lg">
<i class="fa fa-fw fa-lock"></i> '.t('Access your account').'
</a>
</p>
</div>
</div>';
// Choose {
$choose = '
$choose2 = '
<script type="text/javascript">
jQuery(document).ready(function() {
jQuery(\'#choose .btn-success\').on(\'click\', function() {
......@@ -235,8 +267,8 @@
// Accueil full
if($bookmarklet == '') {
echo $meta.$header.$registration.$login.$about.$footer;
echo $meta.$header.$choose1.$registration.$login.$about.$footer;
// Accueil iframe nav
} else {
echo $meta.$choose.$registration.$login.$footer;
echo $meta.$choose2.$registration.$login.$footer;
}
\ No newline at end of file
......@@ -39,7 +39,7 @@ $t['Redirector'] = 'Redirection';
$t['for example'] = 'par exemple';
$t['will mask the HTTP_REFERER'] = 'masquera votre HTTP_REFERER';
$t['All new links are private by default'] = 'Tous les nouveaux liens sont privés par défaut';
$t['Do not show any links if the user is not logged in.'] = 'Ne pas afficher de lien si l’utilisateur n’est pas conecté.';
$t['Do not show any links if the user is not logged in.'] = 'Ne pas afficher de lien si l’utilisateur n’est pas connecté.';
$t['Options'] = 'Options';
$t['Disable session cookie hijacking protection'] = 'Désactiver le cookie de protection anti hijacking';
$t['Check this if you get disconnected often or if your IP address changes often.'] = 'Cochez en cas de problème de déconnexions à répétition ou si votre adresse IP change souvent.';
......@@ -80,7 +80,7 @@ $t['Selection:'] = 'Sélectionner :';
$t[' All'] = ' Tout';
$t[' Private'] = ' Privés';
$t[' Public'] = ' Publics';
$t['Prepend note permalinks with this Shaarli instance\'s URL'] = '';
$t['Prepend note permalinks with this Shaarli instance\'s URL'] = 'Préfixer les liens des notes avec l’<abbr>URL</abbr> de cette instance de Shaarli';
$t['<em>(useful to import bookmarks in a web browser)</em>'] = '<i>(utile pour importer des marque-pages dans son navigateur web)</i>';
$t['Export'] = 'Exporter';
......@@ -103,7 +103,8 @@ $t['Search text'] = 'Texte recherché';
$t['Nothing found'] = 'Rien trouvé';
$t['Sorry... We found nothing'] = 'Désolé… Nous n’avons rien trouvé';
$t[' for '] = ' pour ';
$t[' tagged '] = ' tagué ';
$t['results'] = 'résultat(s)';
$t[' tagged '] = ' tagué(s) ';
$t['Don\'t show links with this tag'] = 'Ne pas afficher les liens contenant ce tag';
$t['Link list'] = 'Liste des liens';
$t['Edit'] = 'Modifier';
......@@ -197,7 +198,7 @@ $t['Enable, disable and configure plugins.'] = 'Activer, désactiver et configur
$t['Change password'] = 'Changement de mot de passe';
$t['Change your password.'] = 'Changez votre mot de passe';
$t['Rename/delete tags'] = 'Renommer/supprimer des tags';
$t['Rename or delete a tag in all links'] = 'Renomer ou supprimer des tags dans tous les liens';
$t['Rename or delete a tag in all links'] = 'Renommer ou supprimer des tags dans tous les liens';
$t['Import'] = 'Importer';
$t['Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)'] = 'Importer un fichier de marque-pages HTML (exportés depuis Firefox, Chrome, Opera…)';
$t['Export'] = 'Exporter';
......
<?php /* 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 */ ?>
\ No newline at end of file
......@@ -38,6 +38,9 @@ jQuery(document).ready(function(){
);
}
jQuery('#configform #titleLink,#configform #updateCheck').parent().parent().hide();
jQuery('#footer').css('visibility','hidden');
// Styling addlink_toolbar
jQuery('#addlink_toolbar form')
.wrapInner('<div class="input-group"></div>')
......
<?php
// Need to be moved and renamed in data/tags_advanced.php
$taData = array(
0 => array('pad', 'fa-align-left fc_v7', '.framapad.org', true, false),
1 => array('sondage', 'fa-calendar-check-o fc_v7', 'framadate.org', true, false),
2 => array('pic', 'fa-photo fc_v7', '(framapic.org|lut.im)', true, false),
3 => array('degooglisons', 'fa-shield fc_o5', '', true, false),
4 => array('projet1', 'fa-clock-o fc_b5', '', true, false),
5 => array('projet2', 'fa-clock-o fc_j6', '', true, true),
0 => array('dégooglisons', 'fa-shield fc_o5', 'degooglisons-internet.org', true, false),
1 => array('projet-top-secret', 'fa-clock-o fc_j6', '', true, true),
2 => array('framapad', 'fa-align-left fc_v7', '.framapad.org', true, false),
3 => array('framacalc', 'fa-th fc_v7', 'framacalc.org', true, false),
4 => array('framaslides', 'fa-map-pin fc_v7', 'framaslides.org', false, false),
5 => array('framaforms', 'fa-list-ul fc_v7', 'framaforms.org', true, false),
6 => array('framapetitions', 'fa-map-pin fc_v7', 'framapetitions.org', false, false),
7 => array('framindmap', 'fa-sitemap fa-rotate-270 fc_v7', 'framindmap.org', true, false),
8 => array('framemo', 'fa-object-group fc_v7', 'framemo.org', true, false),
9 => array('framagenda', 'fa-calendar fc_v7', 'framagenda.org', true, false),
10 => array('framadate', 'fa-calendar-check-o fc_v7', 'framadate.org', true, false),
11 => array('framaboard', 'fa-dashboard fc_v7', 'framaboard.org', true, false),
12 => array('framacarte', 'fa-map fc_v7', 'framacarte.org', true, false),
13 => array('framapic', 'fa-photo fc_v7', '(framapic.org|lut.im)', true, false),
14 => array('framadrop', 'fa-send fc_v7', 'framadrop.org', true, false),
15 => array('framabin', 'fa-paste fc_v7', 'framabin.org', true, false),
16 => array('git', 'fa-git fc_v7', '(framagit.org|github.com)', false, false),
17 => array('wikipedia', 'fa-wikipedia-w fc_g9', 'wikipedia.org', true, false),
);
?>
\ No newline at end of file
......@@ -127,7 +127,7 @@ function hook_tags_advanced_render_tagcloud($data)
foreach($taData as $k => $v) {
// add icon
if($data['tags'][$v[0]]['count']>0) {
if(isset($data['tags'][$v[0]]) && $data['tags'][$v[0]]['count']>0) {
$data['tags'][$v[0]]['icon'] = '<i class="fa fa-fw fa-lg '.htmlentities($v[1]).'"></i>';
}
// remove private tags
......
......@@ -31,7 +31,7 @@
{if="isset($value[0])"}
<div id="daily_col{$counter+1}">
{loop="value"}
<div id="{$value.linkdate|smallHash}" class="link-outer ombre {if="$value.class"} {$value.class}{/if}">
<div id="{$value.linkdate|smallHash}" class="link-outer ombre">
<div class="link-inner">
<div class="link-header">
<div class="row">
......
......@@ -1073,7 +1073,7 @@ a.link-title {
font-weight: bold;
display: block;
color: #333;
text-decoration: none;
text-decoration: none !important;
font-weight: 700;
}
......@@ -1112,12 +1112,12 @@ a.link-title:hover { color: #999; }
}
.link-tag-list {
/*.link-tag-list {
overflow: hidden;
overflow-x: auto;
text-overflow: ellipsis;
white-space: nowrap;
}
}*/
.link-tag{ display: inline-block }
......@@ -1125,7 +1125,7 @@ a.link-title:hover { color: #999; }
.link-tag-filter {
display: inline-block;
color: #888;
text-decoration: none;
text-decoration: none !important;
padding: .2em .6em .3em;
background-color: #ddd;
line-height: 1;
......@@ -1145,7 +1145,7 @@ a.link-title:hover { color: #999; }
}
a.link-url {
color: #999;
text-decoration: none;
text-decoration: none !important;
overflow: hidden;
text-overflow: ellipsis;
max-width:250px;
......@@ -1263,7 +1263,7 @@ a.link-url:hover{ color: #333; }
}
.picwall_pictureframe a {
text-decoration:none;
text-decoration:none !important;
color:#4C4B4A;
}
......@@ -1293,9 +1293,14 @@ a.link-url:hover{ color: #333; }
#taList {
padding-left:0;
}
#taList a { text-decoration:none !important;}
/*
* Todo Drag&drop
*
#taList i.fa {
cursor: hand;
}
}*/
#editlinkform {
padding:20px 30px;
......
......@@ -34,9 +34,9 @@
</div>
{elseif="!empty($search_term) or !empty($search_tags)"}
<div id="searchcriteria" class="well">
{$result_count} results
{$result_count} {'results'|t}
{if="!empty($search_term)"}{' for '|t}<strong>{$search_term}</strong>{/if}
{if="!empty($search_tags)"}{$exploded_tags=explode(' ', $search_tags)}{' tagged'|t}
{if="!empty($search_tags)"}{$exploded_tags=explode(' ', $search_tags)}{' tagged '|t}
{loop="$exploded_tags"}
<span class="link-tag-filter">{$value} 
<a href="?removetag={$value}" title="{'Don\'t show links with this tag'|t}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment