from olivier: use double quotes in js strings, updated FR translation

from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
This commit is contained in:
friendica 2014-02-07 13:37:33 -08:00
parent c80325b427
commit 63589d4f2e
5 changed files with 8602 additions and 6083 deletions

View File

@ -24,7 +24,7 @@ function menu_fetch($name,$uid,$observer_xchan) {
return null; return null;
} }
function menu_render($menu) { function menu_render($menu, $edit = false) {
if(! $menu) if(! $menu)
return ''; return '';
@ -38,6 +38,7 @@ function menu_render($menu) {
return replace_macros(get_markup_template('usermenu.tpl'),array( return replace_macros(get_markup_template('usermenu.tpl'),array(
'$menu' => $menu['menu'], '$menu' => $menu['menu'],
'$edit' => $edit,
'$items' => $menu['items'] '$items' => $menu['items']
)); ));
} }

View File

@ -46,6 +46,7 @@ function directory_content(&$a) {
$tpl = get_markup_template('directory_header.tpl'); $tpl = get_markup_template('directory_header.tpl');
$dirmode = intval(get_config('system','directory_mode')); $dirmode = intval(get_config('system','directory_mode'));

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,33 +2,33 @@
var aStr = { var aStr = {
'delitem' : '{{$delitem}}', 'delitem' : "{{$delitem}}",
'comment' : '{{$comment}}', 'comment' : "{{$comment}}",
'showmore' : '{{$showmore}}', 'showmore' : "{{$showmore}}",
'showfewer' : '{{$showfewer}}', 'showfewer' : "{{$showfewer}}",
'pwshort' : '{{$pwshort}}', 'pwshort' : "{{$pwshort}}",
'pwnomatch' : '{{$pwnomatch}}', 'pwnomatch' : "{{$pwnomatch}}",
'everybody' : '{{$everybody}}', 'everybody' : "{{$everybody}}",
'passphrase' : '{{$passphrase}}', 'passphrase' : "{{$passphrase}}",
'passhint' : '{{$passhint}}', 'passhint' : "{{$passhint}}",
't01' : {{$t01}}, 't01' : {{$t01}},
't02' : {{$t02}}, 't02' : {{$t02}},
't03' : '{{$t03}}', 't03' : "{{$t03}}",
't04' : '{{$t04}}', 't04' : "{{$t04}}",
't05' : '{{$t05}}', 't05' : "{{$t05}}",
't06' : '{{$t06}}', 't06' : "{{$t06}}",
't07' : '{{$t07}}', 't07' : "{{$t07}}",
't08' : '{{$t08}}', 't08' : "{{$t08}}",
't09' : '{{$t09}}', 't09' : "{{$t09}}",
't10' : '{{$t10}}', 't10' : "{{$t10}}",
't11' : '{{$t11}}', 't11' : "{{$t11}}",
't12' : '{{$t12}}', 't12' : "{{$t12}}",
't13' : '{{$t13}}', 't13' : "{{$t13}}",
't14' : '{{$t14}}', 't14' : "{{$t14}}",
't15' : '{{$t15}}', 't15' : "{{$t15}}",
't16' : '{{$t16}}', 't16' : "{{$t16}}",
't17' : '{{$t17}}', 't17' : "{{$t17}}",
}; };
</script> </script>