diff options
| author | czaks <marcin@6irc.net> | 2013-08-17 16:22:04 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-17 16:22:04 -0400 |
| commit | ff479e8bcbf2c9535bd614442ae62858fdd870ec (patch) | |
| tree | 07bf06f834efa9bd1300fe104b5a68e3ca47ddfc /templates | |
| parent | bf119b7abd1f37a2871be7cf652adbcd37486a1e (diff) | |
| parent | 5c2ec21e139ab6be4dcf5d5a5d548f402594f39d (diff) | |
Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.js | 10 | ||||
| -rw-r--r-- | templates/post_form.html | 14 |
2 files changed, 9 insertions, 15 deletions
diff --git a/templates/main.js b/templates/main.js index 78054a3b..05a8fd5f 100644 --- a/templates/main.js +++ b/templates/main.js @@ -265,7 +265,15 @@ function ready() { onready(init); -{% endraw %}{% if config.google_analytics %}{% raw %} +{% endraw %} + +var oekaki_options = { + width: {{config.oekaki.width}}, + height: {{config.oekaki.height}}, + root: '{{config.root}}' +}; + +{% if config.google_analytics %}{% raw %} var _gaq = _gaq || [];_gaq.push(['_setAccount', '{% endraw %}{{ config.google_analytics }}{% raw %}']);{% endraw %}{% if config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', '{% endraw %}{{ config.google_analytics_domain }}{% raw %}']){% endraw %}{% endif %}{% if not config.google_analytics_domain %}{% raw %}_gaq.push(['_setDomainName', 'none']){% endraw %}{% endif %}{% raw %};_gaq.push(['_trackPageview']);(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);})();{% endraw %}{% endif %} diff --git a/templates/post_form.html b/templates/post_form.html index 93ca821e..b2e186cc 100644 --- a/templates/post_form.html +++ b/templates/post_form.html @@ -95,20 +95,6 @@ {{ antibot.html() }} </td> </tr> - {% if config.oekaki %} - <tr id="oekaki"> - <th> - {% trans %}Oekaki{% endtrans %} - </th> - <td> - <canvas width="500" height="250" id="cvs" style="border:1px solid black;-webkit-user-select: none;-moz-user-select: none;">lol what you looking at the source for nerd</canvas> - <p><button type="button" id="brushsize">Brush size</button><input class="color" id="color" value="000000" placeholder="Color"/><button type="button" id="text">Set text</button><button type="button" id="clear">Clear</button><button type="button" id="save">Save</button><button type="button" id="load">Load</button><br/> - <button type="button" id="eraser">Toggle eraser</button><button type="button" id="getcolor">Get color</button><button type="button" id="fill">Fill</button> - </p><p><textarea id="savebox"></textarea><label><input id="confirm_oekaki" type="checkbox"/> Use oekaki instead of file?</label></p> - <img id="saved" style="display:none"> - </td> - </tr> - {% endif %} {% if config.enable_embedding %} <tr> <th> |