Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n

This commit is contained in:
mluto 2013-01-25 17:14:56 +01:00
commit 4a20a26cbf
13 changed files with 307 additions and 116 deletions

View file

@ -1,6 +1,6 @@
<html>
<head>
<title>Etherpad Lite Admin Dashboard</title>
<title>Admin Dashboard - Etherpad lite</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="stylesheet" href="../static/css/admin.css">
<script src="../static/js/jquery.js"></script>
@ -8,13 +8,14 @@
</head>
<body>
<div id="wrapper">
<h1>Etherpad Lite Admin Dashboard</h1>
<div>
<a href="../admin/plugins">Install and Uninstall plugins</a>
</div>
<div>
<a href="../admin/settings">Modify Server and Plugin Settings</a>
<div class="menu">
<h1>Etherpad lite</h1>
<li><a href="admin/plugins">Plugin manager</a> </li>
<li><a href="admin/settings">Settings</a> </li>
<li><a href="admin/plugins/info">Troubleshooting information</a> </li>
</div>
</div>
<div id="topborder"></div>
</body>
</html>

View file

@ -4,27 +4,36 @@
<html>
<head>
<title>Plugin information</title>
<title>Plugin information - Etherpad lite</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="stylesheet" href="../../static/css/admin.css">
</head>
<body>
<div id="wrapper">
<h1>Etherpad Lite</h1>
<div class="separator"></div>
<div class="menu">
<h1>Etherpad lite</h1>
<li><a href="../plugins">Plugin manager</a> </li>
<li><a href="../settings">Settings</a> </li>
<li><a href="../plugins/info">Troubleshooting information</a> </li>
</div>
<h2>Installed plugins</h2>
<pre><%- plugins.formatPlugins().replace(", ","\n") %></pre>
<div class="innerwrapper">
<h2>Installed parts</h2>
<pre><%= plugins.formatParts() %></pre>
<h2>Installed plugins</h2>
<pre><%- plugins.formatPlugins().replace(", ","\n") %></pre>
<h2>Installed hooks</h2>
<h3>Server side hooks</h3>
<div><%- plugins.formatHooks() %></div>
<h2>Installed parts</h2>
<pre><%= plugins.formatParts() %></pre>
<h3>Client side hooks</h3>
<div><%- plugins.formatHooks("client_hooks") %></div>
<h2>Installed hooks</h2>
<h3>Server side hooks</h3>
<div><%- plugins.formatHooks() %></div>
<h3>Client side hooks</h3>
<div><%- plugins.formatHooks("client_hooks") %></div>
</div>
</div>
<div id="topborder"></div>
</body>
</html>

View file

@ -1,6 +1,6 @@
<html>
<head>
<title>Plugin manager</title>
<title>Plugin manager - Etherpad lite</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="stylesheet" href="../static/css/admin.css">
<script src="../static/js/jquery.js"></script>
@ -18,12 +18,16 @@
</div>
<% } %>
<div class="menu">
<h1>Etherpad lite</h1>
<li><a href="plugins">Plugin manager</a> </li>
<li><a href="settings">Settings</a> </li>
<li><a href="plugins/info">Troubleshooting information</a> </li>
<div id="progress"><img src="../static/img/loading.gif" alt=""/>&nbsp;&nbsp;<span class="message"></span></div>
</div>
<h1>Etherpad Lite</h1>
<a href="plugins/info">Technical information on installed plugins</a>
<div class="separator"></div>
<div class="innerwrapper">
<h2>Installed plugins</h2>
<table>
<thead>
@ -50,11 +54,12 @@
<div class="paged listing search-results">
<div class="separator"></div>
<h2>Search for plugins to install</h2>
<h2>Available plugins</h2>
<form>
<input type="text" name="search" placeholder="Search term" id="search-query">
<input type="button" value="Search" id="do-search">
<input type="text" name="search" placeholder="Search for plugins to install" id="search-query">
</form>
<table>
<thead>
<tr>
@ -81,14 +86,9 @@
<span class="offset"></span>..<span class="limit"></span> of <span class="total"></span>.
<input type="button" value=">>" class="do-next-page">
</div>
<div id="progress" class="dialog">
<h1 class="title">
Please wait: <span class="message"></span>
<input type="button" class="close" value="Close">
</h1>
<div class="history"></div>
</div>
</div>
<div id="topborder"></div>
</body>
</html>

View file

@ -1,6 +1,6 @@
<html>
<head>
<title>Settings manager</title>
<title>Settings - Etherpad lite</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<link rel="stylesheet" href="../static/css/admin.css">
<script src="../static/js/jquery.js"></script>
@ -22,13 +22,23 @@
<% } %>
<h1>Etherpad Lite Settings</h1>
<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>
<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="menu">
<h1>Etherpad lite</h1>
<li><a href="plugins">Plugin manager</a> </li>
<li><a href="settings">Settings</a> </li>
<li><a href="plugins/info">Troubleshooting information</a> </li>
</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>
<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>
</div>
<div id="topborder"></div>
</body>
</html>

View file

@ -150,6 +150,7 @@
<link href="static/custom/index.css" rel="stylesheet">
<div id="wrapper">
<% e.begin_block("indexWrapper"); %>
<div id="inner">
<div id="button" onclick="go2Random()" data-l10n-id="index.newPad"></div>
<div id="label" data-l10n-id="index.createOpenPad"></div>
@ -158,6 +159,7 @@
<button type="submit">OK</button>
</form>
</div>
<% e.end_block(); %>
</div>
<script src="static/custom/index.js"></script>