Comment: | Renommage/déplacement du JS et utilisation de l'objet Garradin |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5bd2724e7e3877907d3f9592e8efb82d |
User & Date: | bohwaz on 2015-02-04 06:44:56 |
Other Links: | manifest | tags |
2015-02-13
| ||
01:29 | Pour éviter les soucis d'IPv6 mal configuré (firefox…) on fixe localhost sur 127.0.0.1 check-in: e8fdbaace0 user: bohwaz tags: trunk | |
2015-02-04
| ||
06:44 | Renommage/déplacement du JS et utilisation de l'objet Garradin check-in: 5bd2724e7e user: bohwaz tags: trunk | |
06:29 | Débuts upload fichier check-in: 00cedbfb6a user: bohwaz tags: trunk | |
Modified src/templates/admin/_head.tpl from [96918e5f25] to [9580b680e7].
1 2 3 4 5 6 7 8 9 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>{$title|escape}</title> <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/admin.css" media="all" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css" media="print" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css" media="handheld,screen and (max-width:981px)" /> | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>{$title|escape}</title> <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/admin.css" media="all" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/print.css" media="print" /> <link rel="stylesheet" type="text/css" href="{$admin_url}static/handheld.css" media="handheld,screen and (max-width:981px)" /> {if isset($js) || isset($custom_js)} <script type="text/javascript" src="{$admin_url}static/scripts/global.js"></script> {/if} {if isset($custom_js)} {foreach from=$custom_js item="js"} <script type="text/javascript" src="{$admin_url}static/scripts/{$js|escape}"></script> {/foreach} {/if} {if isset($plugin_css)} {foreach from=$plugin_css item="css"} <link rel="stylesheet" type="text/css" href="{plugin_url file=$css}" /> {/foreach} {/if} |
︙ | ︙ |
Name change from src/www/admin/static/code_editor.min.js to src/www/admin/static/scripts/code_editor.min.js.
Name change from src/www/admin/static/datepickr.css to src/www/admin/static/scripts/datepickr.css.
︙ | ︙ |
Name change from src/www/admin/static/datepickr.js to src/www/admin/static/scripts/datepickr.js.
︙ | ︙ |
Modified src/www/admin/static/scripts/file_upload.js from [8d3bcfe5d7] to [b26cec5034].
︙ | ︙ | |||
36 37 38 39 40 41 42 | document.getElementById('f_titre').value = name; // Vérification de l'existence du fichier var fr = new FileReader; fr.onloadend = function () { if (this.error) return false; var hash = rusha.digestFromArrayBuffer(fr.result); | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | document.getElementById('f_titre').value = name; // Vérification de l'existence du fichier var fr = new FileReader; fr.onloadend = function () { if (this.error) return false; var hash = rusha.digestFromArrayBuffer(fr.result); garradin.load(garradin.admin_url + '_upload_check.php?hash=' + hash, function (data) { if (parseInt(data, 10) == 1) { alert('ok'); } }) }; fr.readAsArrayBuffer(file); |
︙ | ︙ |
Name change from src/www/admin/static/gibberish-aes.min.js to src/www/admin/static/scripts/gibberish-aes.min.js.
︙ | ︙ |
Name change from src/www/admin/static/global.js to src/www/admin/static/scripts/global.js.
︙ | ︙ |
Name change from src/www/admin/static/loader.js to src/www/admin/static/scripts/loader.js.
︙ | ︙ |
Name change from src/www/admin/static/password.js to src/www/admin/static/scripts/password.js.
︙ | ︙ |
Name change from src/www/admin/static/skel_editor.css to src/www/admin/static/scripts/skel_editor.css.
︙ | ︙ |
Modified src/www/admin/static/scripts/skel_editor.js from [817c771ee9] to [a8a0fd3ee8].
1 | (function (){ | < < < < < | < | 1 2 3 4 5 6 7 8 9 | (function (){ garradin.style('scripts/skel_editor.css'); var save_btn = document.querySelector('input[name=save]'); save_btn.type = 'hidden'; var code = new codeEditor('f_content'); code.params.lang = { |
︙ | ︙ | |||
119 120 121 122 123 124 125 | e.target.options[i].selected = true; } } return false; } | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | e.target.options[i].selected = true; } } return false; } var url = garradin.admin_url + 'config/site.php?edit=' + encodeURIComponent(file); window.location.href = url + (code.fullscreen ? '#fullscreen' : ''); return true; }; code.resetFile = function (e) |
︙ | ︙ |
Modified src/www/admin/static/scripts/wiki-encryption.js from [94984cc51a] to [04dce9ff8b].
1 2 3 4 5 6 7 8 9 10 11 12 13 | (function () { var aesEnabled = false; var iteration = 0; var encryptPassword = null; var www_url = location.href.replace(/admin\/.*$/, 'admin/'); function loadAESlib() { if (aesEnabled) { return; } | < < | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | (function () { var aesEnabled = false; var iteration = 0; var encryptPassword = null; var www_url = location.href.replace(/admin\/.*$/, 'admin/'); function loadAESlib() { if (aesEnabled) { return; } garradin.script('scripts/gibberish-aes.min.js'); aesEnabled = true; } function formatContent(content) { // htmlspecialchars ENT_QUOTES content = content.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>') |
︙ | ︙ |
Modified src/www/admin/static/scripts/wikitoolbar.js from [50eede56f9] to [4f796e2427].
︙ | ︙ | |||
129 130 131 132 133 134 135 | window.open('_fichiers.php?page=' + document.getElementById('f_id').value, 'browseFiles', 'width=500,height=600,top=150,left=150,scrollbars=1,location=false'); }); parent.insertBefore(toolbar, txt.parentNode); } | < < < < < < | < | 129 130 131 132 133 134 135 136 137 | window.open('_fichiers.php?page=' + document.getElementById('f_id').value, 'browseFiles', 'width=500,height=600,top=150,left=150,scrollbars=1,location=false'); }); parent.insertBefore(toolbar, txt.parentNode); } garradin.onload(launchToolbar); } () ); |
Modified src/www/admin/wiki/_fichiers.php from [219fbf114c] to [32bc736d10].
︙ | ︙ | |||
37 38 39 40 41 42 43 | } } $tpl->assign('max_size', Utils::getMaxUploadSize()); $tpl->assign('error', $error); $tpl->assign('sent', isset($_GET['sent']) ? true : false); | | | 37 38 39 40 41 42 43 44 45 46 | } } $tpl->assign('max_size', Utils::getMaxUploadSize()); $tpl->assign('error', $error); $tpl->assign('sent', isset($_GET['sent']) ? true : false); $tpl->assign('custom_js', ['file_upload.js']); $tpl->display('admin/wiki/_fichiers.tpl'); |