Merge tag 'v1.5' into calref

(Bumped version to 1.5-calref) "Sombra" ======== Features -------- - cburschka#111: Ctrl+B, I, S and U will automatically add the corresponding BBCode tags around the cursor or selected text. - cburschka#120: The /affiliate command allows admins and owners to set a user's room affiliation. - cburschka#129: Messages can be locally hidden (and unhidden) by clickin an "X" next to the message. - cburschka#131: The tab key will automaticallly complete any partial nickname or chat command in the input field. - cburschka#133: The current room ID is now bound to the URL fragment ("#lounge"). This allows bookmarking or linking directly to rooms, as well as inviting other cadence users to a room by sending a [url=#room][/url] link. - New ponicon: :symad: Enhancements ------------ - cburschka#62: The user's own roster entry is emphasized. - cburschka#74: Instead of a settings cookie, cadence now uses HTML5 local storage. This has an increased size limit and is not sent to the server. - cburschka#78: Emoticon codes inside <code> tags are not rendered. - cburschka#123: The user roster is now sorted alphabetically. - cburschka#126: On the arrival of a user whose nickname matches an alert keyword, the "mention" sound will be played. - cburschka#135: The help sidebar is updated with all new commands. Admin commands are grouped under a separate section. The commands themselves are printed as code, instead of being italicized. - cburschka#139: Raised maximum displayed nickname length from 32 to 48. Bugfixes -------- - cburschka#116: Fixed a regression in the /msg command regex. - cburschka#119: Fix the "Connection failed (improper-addressing)" error when restarting after a remote-dropped connection, caused by a stale connection object. - cburschka#122: Skip code compression when YUI is not installed. - cburschka#124: When clicking on a nickname with spaces, and then clicking another user, only the first part of the nickname was replaced in the input field. - cburschka#128: /bans printed a poorly formatted message with an empty banlist. - cburschka#134: Removed the last remnants of the never-displayed splash page. - cburschka#136: Fixed an alignment problem affecting the [b] button on some devices. The bold font weight caused the button to be placed slightly lower than the others.
calref · Dec 29, 2014 · 075e886 · 075e886
2 parents 4d03312 + c8e282b
commit 075e886
Show file tree

Hide file tree

Showing 25 changed files with 288 additions and 95 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-VERSION=1.4.1-calref
+VERSION=1.5-calref
diff --git a/configure b/configure
@@ -22,7 +22,8 @@ def main():
     args.css_alt = ' '.join(sorted([x[:-4] for x in os.listdir(args.src_path + '/css/alt/') if x[-4:] == '.css']))
 
     if args.mode == 'minify' and subprocess.call(['which', 'yui-compressor'], stdout=open(os.devnull, 'w')):
-        args.mode == 'aggregate'
+        print('yui-compressor is not installed. The code will not be compressed.')
+        args.mode = 'aggregate'
 
     open('.config.vars', 'w+').write(
 '''TITLE={title}

diff --git a/css/alt/Carbon.css b/css/alt/Carbon.css
@@ -21,5 +21,3 @@ h3, a { color: #fc0 }
 .row:nth-child(odd) { background-color: black }
 .user-role-bot { color: #c90 }
 #content #colorCodesContainer a { border-color: black }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Helium.css b/css/alt/Helium.css
@@ -23,5 +23,3 @@ button:hover { background: rgba(0,0,0,0.05) }
 button:active { background: rgba(0,0,0,0.2) }
 input[type=text], input[type=password] { padding-left: 5px }
 .row:nth-child(odd) { background: rgba(256,256,256,0) }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Mercury.css b/css/alt/Mercury.css
@@ -24,5 +24,3 @@
 button:hover { background-color: #555 }
 input[type=image], button { border: 0 }
 a, .user-role-bot { color: #f6b620 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Plum.css b/css/alt/Plum.css
@@ -36,5 +36,3 @@ button {
 button:hover { background-color: #591e33 }
 h3, .author { color: #cda6d2 }
 .row.delayed .log-room, .row.delayed .dateTime { color: #673570 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Selenium.css b/css/alt/Selenium.css
@@ -28,5 +28,3 @@ select { background: #101040 }
 button:hover { background: rgba(0,0,0,0.3) }
 button:active { background: rgba(256,256,256,0.1) }
 input[type=text], input[type=password] { padding-left: 5px }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Stygium.css b/css/alt/Stygium.css
@@ -12,5 +12,3 @@ a { color: white }
 button, input, select, #inputFieldContainer { background: #222 }
 button:hover { background: #444 }
 button:active { background: #666 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Sulfur.css b/css/alt/Sulfur.css
@@ -22,5 +22,3 @@ button, h3 {
 .user-role-bot, #content a { color: #b84623 }
 .row.delayed .dateTime, .row.delayed .log-room { color: #555 }
 .author { color: black }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Technetium.css b/css/alt/Technetium.css
@@ -35,5 +35,3 @@ button, #loginContainer input { border: 1px solid #06b } /* blue borders around
   transition-timing-function: cubic-bezier(0.2, 0.4, 0.7, 0.8);
 }
 .user-role-bot { color:#32cd32 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/Uranium.css b/css/alt/Uranium.css
@@ -145,5 +145,3 @@ background-image:    -moz-linear-gradient(top, #3b6c37, #223220, #171717);
 background-image:      -o-linear-gradient(top, #3b6c37, #223220, #171717);
 background-image:         linear-gradient(to bottom, #3b6c37, #223220, #171717);
 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/dash.css b/css/alt/dash.css
@@ -32,5 +32,3 @@ h3 {
 .author .user-affiliation-owner,
 #onlineList .user-affiliation-owner { color: #ee3f44 }
 .user-role-bot { color: #d9559f }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/alt/omg.css b/css/alt/omg.css
@@ -17,5 +17,3 @@ button {
   color: white;
 }
 .box, #bbCodeContainer button { border-color: #32cd32 }
-#content { display: block }
-#nocontent { display: none }
diff --git a/css/global/borders.css b/css/global/borders.css
@@ -1,4 +1,4 @@
 img, textarea { border:none }
 .box, #colorCodesContainer a { border:1px solid }
 #helpList table, #settingsList table { border-collapse: collapse }
-button, span.user { cursor:pointer }
+button, span.user, span.hide-message, span.hidden { cursor:pointer }
diff --git a/css/global/fonts.css b/css/global/fonts.css
@@ -6,9 +6,11 @@ h3 { font-size:1.3em }
 a { text-decoration:none }
 a:hover { text-decoration:underline }
 .author { font-weight:bold }
-.action, .user-role-bot, .message-bot, .privmsg, #helpList td.code { font-style:italic }
+#onlineList .user-self { font-weight:bold }
+.action, .user-role-bot, .message-bot, .privmsg { font-style:italic }
 q { font-variant:small-caps }
 code {
   font-size:1.2em;
   white-space:pre-wrap;
 }
+#helpList td.code { font-family:monospace; white-space:pre }
diff --git a/css/global/icons.css b/css/global/icons.css
@@ -57,3 +57,10 @@
   -webkit-transition-duration: 0.5s;
   -webkit-transition-timing-function: cubic-bezier(0.2, 0.4, 0.7, 0.8);
 }
+
+span.hide-message {
+  display:inline-block;
+  height:10px;
+  width:10px;
+  background-image:url('../../img/delete.png');
+}
diff --git a/css/global/layout.css b/css/global/layout.css
@@ -107,6 +107,10 @@ h3 {
   right: 20px;
 }
 #footerContainer div { display: inline-block }
+
+#bbCodeContainer button { line-height: 1.4em }
+#bbCodeContainer button[value=b] { vertical-align: bottom }
+
 #footerContainer #colorCodesContainer {
   bottom: 48px;
   left: 20px;
@@ -171,3 +175,13 @@ h3 {
   padding-right: 20px;
 }
 img.emoticon { vertical-align: middle }
+
+span.hide-message {
+  float: right;
+  margin-top: 3px;
+}
+span.hidden {
+  display: none;
+  font-style: italic;
+  font-size: 90%;
+}
diff --git a/index.tpl.html b/index.tpl.html
@@ -3,21 +3,6 @@
 <head>
   <meta charset="utf8" />
   <title>@@@TITLE@@@</title>
-  <style type="text/css">
-    html, body { height:100%; }
-    #content { display: none; }
-    #nocontent {
-      background:black;
-      color:white;
-      height:100%;
-    }
-    #splash {
-      position:relative;
-      top:40%;
-      text-align:center;
-      font-family:sans;
-    }
-  </style>
   @@@CSS_LINKS@@@
   <link rel="stylesheet" type="text/css" href="custom.css" charset="UTF-8" />
 
@@ -96,29 +81,34 @@ <h3>Online users</h3>
       <h3>Help</h3>
       <div id="helpList">
         <table>
+          <caption><h4>Chat commands</h3></caption>
           <tr class="row">
-            <td class="desc">Set away status.</td>
+            <td class="desc">Create a macro:</td>
+            <td class="code">/alias &lt;cmd&gt; /a; /b</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Set away status:</td>
             <td class="code">/away &lt;message&gt;</td>
           </tr>
           <tr class="row">
-            <td class="desc">Remove away status.</td>
+            <td class="desc">Remove away status:</td>
             <td class="code">/back</td>
           </tr>
           <tr class="row">
-            <td class="desc">Clear all messages.</td>
+            <td class="desc">Clear all messages:</td>
             <td class="code">/clear</td>
           </tr>
           <tr class="row">
-            <td class="desc">Connect and join chat:</td>
-            <td class="code">/connect &lt;user&gt; &lt;password&gt;</td>
+            <td class="desc">Connect:</td>
+            <td class="code">/connect &lt;user&gt; &lt;pass&gt;</td>
           </tr>
           <tr class="row">
-            <td class="desc">Join a room:</td>
-            <td class="code">/join &lt;room&gt;</td>
+            <td class="desc">Create a new room:</td>
+            <td class="code">/create &lt;title&gt;</td>
           </tr>
           <tr class="row">
-            <td class="desc">Kick a user:</td>
-            <td class="code">/kick &lt;nickname&gt; [&lt;reason&gt;]</td>
+            <td class="desc">Join a room:</td>
+            <td class="code">/join &lt;room&gt;</td>
           </tr>
           <tr class="row">
             <td class="desc">List available rooms:</td>
@@ -130,16 +120,20 @@ <h3>Help</h3>
           </tr>
           <tr class="row">
             <td class="desc">Private message:</td>
-            <td class="code">/msg &lt;nickname&gt; &lt;text&gt;</td>
+            <td class="code">/msg &lt;nick&gt; ...</td>
           </tr>
           <tr class="row">
             <td class="desc">Describe action in private message:</td>
-            <td class="code">/msg &lt;nickname&gt; /me &lt;text&gt;</td>
+            <td class="code">/msg &lt;nick&gt; /me ...</td>
           </tr>
           <tr class="row">
             <td class="desc">Change nickname:</td>
             <td class="code">/nick &lt;nickname&gt;</td>
           </tr>
+          <tr class="row">
+            <td class="desc">Leave the room:</td>
+            <td class="code">/part</td>
+          </tr>
           <tr class="row">
             <td class="desc">Disconnect:</td>
             <td class="code">/quit</td>
@@ -148,11 +142,46 @@ <h3>Help</h3>
             <td class="desc">Save history as text:</td>
             <td class="code">/save [html]</td>
           </tr>
+          <tr class="row">
+            <td class="desc">Say something:</td>
+            <td class="code">[/say] ...</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Print version:</td>
+            <td class="code">/version</td>
+          </tr>
           <tr class="row">
             <td class="desc">List users in the current room:</td>
             <td class="code">/who</td>
           </tr>
         </table>
+        <table>
+          <caption><h4>Administration commands</h4></caption>
+          <tr class="row">
+            <td class="desc">Server command:</td>
+            <td class="code">/admin announce|motd ...</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Change privileges:</td>
+            <td class="code">/affiliate &lt;type&gt; &lt;user&gt;</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Ban a user:</td>
+            <td class="code">/ban &lt;user&gt;</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">List active bans:</td>
+            <td class="code">/bans</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Kick a user:</td>
+            <td class="code">/kick &lt;nickname&gt; [&lt;reason&gt;]</td>
+          </tr>
+          <tr class="row">
+            <td class="desc">Unban a user:</td>
+            <td class="code">/unban &lt;JID&gt;</td>
+          </tr>
+        </table>
       </div>
       <!-- / helpList -->
     </div>
@@ -266,13 +295,5 @@ <h3>Settings</h3>
     </div>
     <!-- / settingsContainer-->
   </div>
-  <div id="nocontent">
-    <div id="splash">
-      <span id="javascriptOff">This is a client-side web application. Please open this page with a browser that runs JavaScript.</span>
-    </div>
-    <script type="text/javascript">
-    document.getElementById('javascriptOff').style.display='none';
-    </script>
-  </div>
 </body>
 </html>