* add emojis

* set correct logo in the application
* update all dependencies and frameworks

DeveloperGuide.md

@@ -3,7 +3,7 @@ SUM Developement Guide
 
 This is a short introduction in the architecture of SUM. This guide is for all who plan to enhance or change SUM.
 
-SUM uses node-webkit as environment, jquery for the frontend, node for the backend. Ensure that you understand the basics of this frameworks.
+SUM uses nw.js as environment, jquery for the frontend, node for the backend. Ensure that you understand the basics of this frameworks.
 
 
 BASIC SETUP
@@ -12,7 +12,7 @@ BASIC SETUP
 For running SUM in development mode, building SUM executable or building setup, you have to install following tools:
 
  1. install [node.js](http://nodejs.org/)
- 2. ```npm install nodewebkit -g``` installs node webkit which is a webkit browser with build in node
+ 2. ```npm install nw -g``` installs node webkit which is a webkit browser with build in node
  3. ```npm install grunt-cli -g``` installs the build tool grunt
  4. ```npm install``` in SUM folder install all development dependencies
  5. if you plan to build a setup then install [InnoSetup](http://www.jrsoftware.org/isinfo.php) and add it to your path environment variable
@@ -24,7 +24,7 @@ RUN, BUILD, TEST SUM
 
 After doing basic setup you can run, build and test SUM. Open your command line and change into the SUM directory.
 
- - ```nodewebkit``` starts SUM
+ - ```nw``` starts SUM
  - ```grunt build``` compiles SUM executable
  - ```grunt check``` runs tests and jshint
  - ```grunt version --newversion=1.2.3``` updates the version information in package.json, setup.iss and readme.md

README.md

@@ -119,8 +119,8 @@ Thanks a lot to [Andi](https://github.com/DaAndi82) for implementing code messag
 
 Special thanks to the great programmers of this libraries which will be used in SUM:
 
-* node-webkit: https://github.com/rogerwang/node-webkit
-* jquery: http://jquery.com/
+* nw.js: https://github.com/nwjs/nw.js
+* jquery: http://jquery.com
 * lockfile: https://github.com/isaacs/lockfile
 * node-rsa: https://github.com/rzcoder/node-rsa
 * ini: https://github.com/isaacs/ini
@@ -143,9 +143,9 @@ Special thanks to the great programmers of this libraries which will be used in
 * CryptoJS: https://code.google.com/p/crypto-js/
 * ionicons: http://ionicons.com/
 * WebIconset.com Emoticons: http://www.webiconset.com/emoticons-smilies-icon-set/
+* Emojify.js Emoticons: https://github.com/hassankhan/emojify.js/
 * Website Template: http://html5up.net/
 * Application Icon: http://www.graphicsfuel.com/
 * Font Oswald: http://www.fontsquirrel.com/fonts/oswald
 
-
 Dependencies Status: https://david-dm.org/ssilence/sum

app/default.ini

@@ -23,7 +23,7 @@ lock_file = c:/tmp/userfile.lock
 iv = 101114131415161718191a1b1c1d1e1f
 
 ; language (de for German, en for English)
-language = en
+language = de
 
 ; path of version file
 version_file = c:/tmp/version

app/index.html

@@ -22,9 +22,9 @@
         <!-- login -->
         <div id="login" class="fullscreen">
             <div>
-                <div class="logo"><span class="ion-speakerphone"></span>SUM Messenger</div>
+                <div class="logo">SUM Messenger</div>
                 <div class="error"></div>
-                <label>{lang.login_password}</label> <input type="password" class="password">
+                <input type="password" class="password" placeholder="{lang.login_password}">
                 <input class="save" type="button" value="{lang.login_submit}" /> <span class="reset">{lang.login_reset_key}</span>
             </div>
         </div>
@@ -34,7 +34,7 @@
 
             <!-- header -->
             <div class="heading">
-                <span class="ion-speakerphone"></span>SUM Messenger
+                <div class="logo">SUM Messenger</div>
                 <span class="version"></span>
             </div>
 

app/lang/de.js

@@ -151,6 +151,13 @@ var lang = {
     frontend_messages_votes: 'Stimmen',
     frontend_messages_new_vote: 'ein Benutzer hat bei der Umfrage "%s" abgestimmt',
 
+    frontend_emoticons_basic: 'Basis',
+    frontend_emoticons_people: 'Menschen',
+    frontend_emoticons_nature: 'Natur',
+    frontend_emoticons_objects: 'Objekte',
+    frontend_emoticons_places: 'Orte',
+    frontend_emoticons_symbols: 'Symbole',
+
     frontend_room_invite: '%s1 hat dich in den Raum %s2 eingeladen',
     frontend_online: '%s ist jetzt online',
     frontend_offline: '%s ist jetzt offline',

app/lang/en.js

@@ -151,6 +151,13 @@ var lang = {
     frontend_messages_votes: 'votes',
     frontend_messages_new_vote: 'a user voted on the poll: %s',
 
+    frontend_emoticons_basic: 'basic',
+    frontend_emoticons_people: 'people',
+    frontend_emoticons_nature: 'nature',
+    frontend_emoticons_objects: 'objects',
+    frontend_emoticons_places: 'places',
+    frontend_emoticons_symbols: 'symbols',
+
     frontend_room_invite: '%s1 invited you in the room %s2',
     frontend_online: '%s is now online',
     frontend_offline: '%s is now offline',

app/main.css

@@ -187,15 +187,13 @@ input.remove,
 }
 
 .logo {
-    font-size:1.4em;
-    font-size:1.3em;
+    font-size:1.1em;
     font-family: 'oswaldbook';
+    background:url(favicon.png) no-repeat left center;
+    padding-left:45px;
+    background-size: 32px;
 }
 
-    .logo span {
-        margin-right:10px;
-    }
-
 .emoticons {
     width:24px;
 }
@@ -226,13 +224,13 @@ input.remove,
 }
 
     #login > div {
-        width:300px;
+        width:200px;
         height:150px;
         position:absolute;
         left:50%;
         top:50%;
         margin-top:-75px;
-        margin-left:-150px;
+        margin-left:-100px;
     }
 
     #login > div > div > span {
@@ -241,10 +239,10 @@ input.remove,
 
     #login > div > div {
         margin-bottom:20px;
+        font-size: 1.5em;
     }
 
     #login .save {
-        margin-left:89px;
         margin-top:10px;
     }
 
@@ -285,10 +283,6 @@ input.remove,
     padding-top:12px;
 }
 
-    #nav .heading span {
-        padding-right:10px;
-    }
-
     #nav .version {
         position: absolute;
         left: 5px;
@@ -839,6 +833,7 @@ input.remove,
                 font-size:0.8em;
                 text-align:center;
                 margin-top:55px;
+                border-bottom:0;
             }
 
             #open-conversations-menue-dropdown li
@@ -1022,7 +1017,7 @@ input.remove,
 
         .entry-poll-result li div {
             height: 20px;
-            background: #adc797;
+            background: rgba(102, 130, 154, 0.37);
         }
 
         .entry-poll-result li span {
@@ -1032,7 +1027,7 @@ input.remove,
 
         .entry-poll-result li div div {
             height:20px;
-            background: #68b54d;
+            background: rgba(102, 130, 154, 1);
         }
 
         .entry-poll-answers li {
@@ -1253,15 +1248,44 @@ input.remove,
         border: 1px solid #dadada;
         position:absolute;
         background:#f7f7f7;
-        width:200px;
+        width:650px;
         left:100%;
-        margin-left:-230px;
-        padding:5px;
+        margin-left:-730px;
         z-index:29;
     }
 
         #message-emoticons img {
             cursor:pointer;
+            margin-right:2px;
+            margin-bottom:2px;
+        }
+
+        #message-emoticons .emoticons-content {
+            clear:both;
+            display:none;
+            padding:5px;
+        }
+
+        #message-emoticons .emoticons-tabs {
+            padding:0;
+            margin:0;
+            width:100%;
+            background: #f4f4f4;
+            border-top: 1px solid #f1f1f1;
+            list-style:none;
+            height:40px;
+        }
+
+        #message-emoticons .emoticons-tab {
+            float:left;
+            padding:9px;
+            cursor:pointer;
+            border-right: 1px solid #f1f1f1;
+        }
+
+        #message-emoticons .emoticons-tab.active {
+            border-top:0;
+            background:#f9f9f9
         }
 
     #message-input {

app/sum-backend-filesystem.js

@@ -174,5 +174,20 @@ define('sum-backend-filesystem', Class.extend({
         return fs.readdirSync(dir).filter(function (file) {
             return fs.statSync(dir + file).isDirectory();
         });
+    },
+
+
+    /**
+     * returns true if given file exists
+     * @param filename (string) given path and filename
+     * @returns {boolean} true for existing files
+     */
+    fileExists: function(filename) {
+        try {
+            fs.accessSync(filename);
+        } catch(e) {
+            return false;
+        }
+        return true;
     }
 }));

app/sum-backend.js

@@ -159,6 +159,9 @@ define('sum-backend', Class.extend({
         // init window and window event handler
         this.initWindow();
 
+        // emojis
+        this.initEmojis();
+
         // set welcome message
         this.renderSystemMessage(config.welcome_text.replace(/\\n/g, '<br />'), config.room_all);
 
@@ -239,6 +242,31 @@ define('sum-backend', Class.extend({
     },
 
 
+    /**
+     * initialize additional emojis
+     */
+    initEmojis: function() {
+        var path = "node_modules/emojify.js/dist/images/basic/";
+        var that = this;
+        var groups = Object.keys(emojiGroups);
+        $.each(groups, function(index, group) {
+            var emojis = {};
+
+            $.each(emojiGroups[group], function(index, emoji) {
+                var file = path + emoji + '.png';
+                if (that.backendFilesystem.fileExists(file) === false)
+                    return true;
+
+                emojis[":" + emoji + ":"] = '../' + file;
+            });
+            emoticons[group] = emojis;
+        });
+
+        emoticons = $.extend({ basic: basicEmoticons}, emoticons);
+    },
+
+
+
     ////////////////////////////////////////////
     // callback registration for the frontend //
     ////////////////////////////////////////////