diff options
| author | 0ip <me@factor.cc> | 2013-02-09 21:22:23 +0100 |
|---|---|---|
| committer | 0ip <me@factor.cc> | 2013-02-09 21:22:23 +0100 |
| commit | 8fb8f0d3b6ee310dada34bc957e019e5f48f9629 (patch) | |
| tree | c68c4ef6eba30a0d924b29246dc0363cb51995e8 | |
| parent | 40734e677616a18cc9bc126755822fe7d1be6b9b (diff) | |
| download | etherpad-lite-8fb8f0d3b6ee310dada34bc957e019e5f48f9629.zip | |
Change settings layout
| -rw-r--r-- | src/static/css/admin.css | 5 | ||||
| -rw-r--r-- | src/templates/admin/settings.html | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 33ec5710..f60548fc 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -146,6 +146,11 @@ a:focus, a:hover { border-bottom: #333333 1px solid;
}
+pre {
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
+
@media (max-width: 720px) {
div.innerwrapper {
padding: 0 15px 15px 15px;
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 759752ea..4476b733 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -35,12 +35,14 @@ </div>
<div class="innerwrapper">
- <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
- <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
+ <h2>Current configuration</h2>
<textarea class="settings"></textarea>
<input type="button" class="settingsButton" id="saveSettings" value="Save Settings">
<input type="button" class="settingsButton" id="restartEtherpad" value="Restart Etherpad">
<div id="response"></div>
+ <div class="separator"></div>
+ <a href='https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON'>Example production settings template</a>
+ <a href='https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON'>Example development settings template</a>
</div>
</div>
</body>
|