diff options
| author | Michael <savetheinternet@tinyboard.org> | 2013-06-18 10:45:13 -0700 |
|---|---|---|
| committer | Michael <savetheinternet@tinyboard.org> | 2013-06-18 10:45:13 -0700 |
| commit | 0ac9dd5f25ffd9969786567cf7f3081c39f4e0c7 (patch) | |
| tree | fd8e8bce38293493b1565147e1bbc3e3fdb7b875 /templates | |
| parent | cbc3bd0c0a13463dbdbc3d53a03dd9b2080496c4 (diff) | |
| parent | 399aa463b3d046a49c861a2c60c997f39af22561 (diff) | |
Merge pull request #115 from Macil/miscfixes
Miscellaneous fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.js | 2 | ||||
| -rw-r--r-- | templates/page.html | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/templates/main.js b/templates/main.js index b0a96393..9ec0025f 100644 --- a/templates/main.js +++ b/templates/main.js @@ -105,7 +105,7 @@ function generatePassword() { function dopost(form) {
if (form.elements['name']) {
- localStorage.name = form.elements['name'].value.replace(/ ##.+$/, '');
+ localStorage.name = form.elements['name'].value.replace(/( |^)## .+$/, '');
}
if (form.elements['email'] && form.elements['email'].value != 'sage') {
localStorage.email = form.elements['email'].value;
diff --git a/templates/page.html b/templates/page.html index e66b3fff..2f3de358 100644 --- a/templates/page.html +++ b/templates/page.html @@ -7,7 +7,12 @@ <title>{{ title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
- {% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
+ {% if not nojavascript %}
+ <script type="text/javascript" src="{{ config.url_javascript }}"></script>
+ {% if not config.additional_javascript_compile %}
+ {% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
+ {% endif %}
+ {% endif %}
</head>
<body>
{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr>{% endif %}
|