Changeset 3567

Timestamp:

01/23/07 19:09:59 (2 years ago)

Author:

timothy

Message:

Makes the Web Interface look more like Colloquy with the sidebar look. Adds message counts in the sidebar, include highlight message counts. Also fixes the bug where multiple copies of the same message would be appeneded.

Files:

• trunk/Plug-Ins/Web Interface/JVWebInterfacePlugin.m (modified) (3 diffs)
• trunk/Plug-Ins/Web Interface/Resources/base.css (modified) (4 diffs)
• trunk/Plug-Ins/Web Interface/Resources/common.js (modified) (7 diffs)
• trunk/Plug-Ins/Web Interface/Resources/highlightsInvertedLarge.png (added)
• trunk/Plug-Ins/Web Interface/Resources/highlightsInvertedMedium.png (added)
• trunk/Plug-Ins/Web Interface/Resources/highlightsInvertedSmall.png (added)
• trunk/Plug-Ins/Web Interface/Resources/highlightsNormalLarge.png (added)
• trunk/Plug-Ins/Web Interface/Resources/highlightsNormalMedium.png (added)
• trunk/Plug-Ins/Web Interface/Resources/highlightsNormalSmall.png (added)
• trunk/Plug-Ins/Web Interface/Resources/index.html (modified) (1 diff)
• trunk/Plug-Ins/Web Interface/Resources/messagesInvertedLarge.png (added)
• trunk/Plug-Ins/Web Interface/Resources/messagesInvertedMedium.png (added)
• trunk/Plug-Ins/Web Interface/Resources/messagesInvertedSmall.png (added)
• trunk/Plug-Ins/Web Interface/Resources/messagesNormalLarge.png (added)
• trunk/Plug-Ins/Web Interface/Resources/messagesNormalMedium.png (added)
• trunk/Plug-Ins/Web Interface/Resources/messagesNormalSmall.png (added)
• trunk/Plug-Ins/Web Interface/Resources/rowHighlight.png (added)
• trunk/Plug-Ins/Web Interface/Web Interface.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Plug-Ins/Web Interface/JVWebInterfacePlugin.m

@@ -526 +526 @@
-                [attributes setObject:[view uniqueIdentifier] forKey:@"panel"];
-                [attributes setObject:[[message date] description] forKey:@"received"];
+                if( [message isHighlighted] ) [attributes setObject:@"yes" forKey:@"highlighted"];
-
-                NSMutableDictionary *styleParams = [[[view display] styleParameters] mutableCopy];
@@ -547 +548 @@
-                        [body release];
-
-
+
+
-                }
-
@@ -578 +580 @@
-                        [body setStringValue:tmessage];
-
-message
+event
-                        [element setAttributesAsDictionary:attributes];
-                        [element addChild:body];
-                        [body release];
-
-
+
+
-                }
-

trunk/Plug-Ins/Web Interface/Resources/base.css

@@ -4 +4 @@
-        padding: 0;
-        margin: 0;
-}
-
-#timer {
-        color: lightgrey;
-        position: absolute;
-        top: 3px;
-        left: 20px;
-}
-
-#main {
-        position: absolute;
-        top: 20px;
-        left: 20px;
-        right: 20px;
-        bottom: 20px;
-        background-color: rgb( 235, 235, 235 );
-        border-radius: 12px;
-        -moz-border-radius: 12px;
-        padding: 15px;
-}
-
-#drawer {
-        top: 15px;
-        right: 15px;
-        bottom: 15px;
-        position: absolute;
-        width: 175px;
-        margin-left: 4px;
-        overflow: auto;
-}
-
@@ -41 +13 @@
-
-#input {
-
+
+
-        background-color: white;
-        padding: 3px;
-15
-200px
-15px
+200
+0
+0
-        height: 30px;
-        position: absolute;
@@ -55 +28 @@
-
-#panels {
-15px
-15
-200px
-52
-
-: 1px solid rgb( 145, 145, 145
+0
+200
+0
+37
+
+-left: 1px solid rgb( 166, 166, 166
-        margin: 0;
-        padding: 0;
@@ -73 +46 @@
-}
-
-panelList
+sidebar
-        list-style-type: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        width: 200px;
+        overflow: auto;
+        background-color: rgb( 227, 237, 249 );
-}
-
-.memberList {
-        list-style-type: none;
+        padding-left: 16px;
+}
+
+.listItem {
+        position: relative;
+        height: 35px;
+        width: 100%;
+        -khtml-user-select: none;
+        -webkit-user-select: none;
-}
-
-.listItem.member {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-.listItem.selected {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/Plug-Ins/Web Interface/Resources/common.js

@@ -66 +66 @@
-                                                        var panel = ChatController.panel( message.getAttribute( "panel" ) );
-                                                        panel.appendMessage( message.firstChild.nodeValue );
-
+
+
+
+
+
-                                                }
-                                                break;
@@ -91 +95 @@
-                                if( activityCheckInterval ) clearInterval( activityCheckInterval );
-                                activityCheckInterval = setInterval( ChatController.checkActivity, currentActivityCheckInterval );
-
-                                $("timer").innerText = currentActivityCheckInterval / 1000 + " secs";
-                        }
-                },
@@ -117 +119 @@
-        this.listItem.className = "listItem";
-        this.listItem.addEventListener( "click", function( event ) { panel.show(); }, false );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        this.frame = $(document.createElement( "iframe" ));
@@ -126 +154 @@
-
-        ChatController.panels.push( this );
-panelList
+sidebar
-        $("panels").appendChild( this.frame );
-
@@ -261 +289 @@
-
-DirectChatPanel.prototype.updateNewMessageCount = function( messages ) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-DirectChatPanel.prototype.updateHighlightMessageCount = function( messages ) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-DirectChatPanel.prototype.focused = function() {
-
-
-
-
-
+
+
-}
-
@@ -298 +352 @@
-        this.memberList.className = "memberList";
-        this.memberList.style.setProperty( "display", "none", "" );
-panelList
+sidebar
-
-        var memberNodes = node.childNodes;
@@ -318 +372 @@
-                member.listItem.title = member.hostmask;
-                member.listItem.className = "listItem member" + ( member.type ? " " + member.type : "" );
-
+
+
+
+
+
+
+
+
+
-
-                this.memberList.appendChild( member.listItem );

trunk/Plug-Ins/Web Interface/Resources/index.html

@@ -14 +14 @@
-</head>
-<body>
-<div id="main">
-<div id="panels"></div>
-<div id="input" contenteditable="true"></div>
-
-
-
+
-</body>
-</html>

trunk/Plug-Ins/Web Interface/Web Interface.xcodeproj/project.pbxproj

@@ -25 +25 @@
-                1CC7250C0901A775004651F8 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 1CC7250B0901A775004651F8 /* index.html */; };
-                1CC726710901BBD2004651F8 /* common.js in Resources */ = {isa = PBXBuildFile; fileRef = 1CC7265F0901BAAE004651F8 /* common.js */; };
+                1CD02E490B66C75400957AF0 /* highlightsInvertedLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E3C0B66C75400957AF0 /* highlightsInvertedLarge.png */; };
+                1CD02E4A0B66C75400957AF0 /* highlightsInvertedMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E3D0B66C75400957AF0 /* highlightsInvertedMedium.png */; };
+                1CD02E4B0B66C75400957AF0 /* highlightsInvertedSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E3E0B66C75400957AF0 /* highlightsInvertedSmall.png */; };
+                1CD02E4C0B66C75400957AF0 /* highlightsNormalLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E3F0B66C75400957AF0 /* highlightsNormalLarge.png */; };
+                1CD02E4D0B66C75400957AF0 /* highlightsNormalMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E400B66C75400957AF0 /* highlightsNormalMedium.png */; };
+                1CD02E4E0B66C75400957AF0 /* highlightsNormalSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E410B66C75400957AF0 /* highlightsNormalSmall.png */; };
+                1CD02E4F0B66C75400957AF0 /* messagesInvertedLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E420B66C75400957AF0 /* messagesInvertedLarge.png */; };
+                1CD02E500B66C75400957AF0 /* messagesInvertedMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E430B66C75400957AF0 /* messagesInvertedMedium.png */; };
+                1CD02E510B66C75400957AF0 /* messagesInvertedSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E440B66C75400957AF0 /* messagesInvertedSmall.png */; };
+                1CD02E520B66C75400957AF0 /* messagesNormalLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E450B66C75400957AF0 /* messagesNormalLarge.png */; };
+                1CD02E530B66C75400957AF0 /* messagesNormalMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E460B66C75400957AF0 /* messagesNormalMedium.png */; };
+                1CD02E540B66C75400957AF0 /* messagesNormalSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E470B66C75400957AF0 /* messagesNormalSmall.png */; };
+                1CD02E550B66C75400957AF0 /* rowHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CD02E480B66C75400957AF0 /* rowHighlight.png */; };
-                1CF3AE700B5B05B100183925 /* smallIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CF3AE6F0B5B05B100183925 /* smallIcon.png */; };
-                8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
@@ -53 +66 @@
-                1CC7250B0901A775004651F8 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
-                1CC7265F0901BAAE004651F8 /* common.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = common.js; sourceTree = "<group>"; };
+                1CD02E3C0B66C75400957AF0 /* highlightsInvertedLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsInvertedLarge.png; sourceTree = "<group>"; };
+                1CD02E3D0B66C75400957AF0 /* highlightsInvertedMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsInvertedMedium.png; sourceTree = "<group>"; };
+                1CD02E3E0B66C75400957AF0 /* highlightsInvertedSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsInvertedSmall.png; sourceTree = "<group>"; };
+                1CD02E3F0B66C75400957AF0 /* highlightsNormalLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsNormalLarge.png; sourceTree = "<group>"; };
+                1CD02E400B66C75400957AF0 /* highlightsNormalMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsNormalMedium.png; sourceTree = "<group>"; };
+                1CD02E410B66C75400957AF0 /* highlightsNormalSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = highlightsNormalSmall.png; sourceTree = "<group>"; };
+                1CD02E420B66C75400957AF0 /* messagesInvertedLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesInvertedLarge.png; sourceTree = "<group>"; };
+                1CD02E430B66C75400957AF0 /* messagesInvertedMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesInvertedMedium.png; sourceTree = "<group>"; };
+                1CD02E440B66C75400957AF0 /* messagesInvertedSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesInvertedSmall.png; sourceTree = "<group>"; };
+                1CD02E450B66C75400957AF0 /* messagesNormalLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesNormalLarge.png; sourceTree = "<group>"; };
+                1CD02E460B66C75400957AF0 /* messagesNormalMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesNormalMedium.png; sourceTree = "<group>"; };
+                1CD02E470B66C75400957AF0 /* messagesNormalSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = messagesNormalSmall.png; sourceTree = "<group>"; };
+                1CD02E480B66C75400957AF0 /* rowHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rowHighlight.png; sourceTree = "<group>"; };
-                1CF3AE6F0B5B05B100183925 /* smallIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = smallIcon.png; sourceTree = "<group>"; };
-                8D5B49B6048680CD000E48DA /* Web Interface.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Web Interface.plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -102 +128 @@
-                                1C7F7CC70B5FF71000D8676C /* utilities.js */,
-                                1CF3AE6F0B5B05B100183925 /* smallIcon.png */,
+                                1CD02E3C0B66C75400957AF0 /* highlightsInvertedLarge.png */,
+                                1CD02E3D0B66C75400957AF0 /* highlightsInvertedMedium.png */,
+                                1CD02E3E0B66C75400957AF0 /* highlightsInvertedSmall.png */,
+                                1CD02E3F0B66C75400957AF0 /* highlightsNormalLarge.png */,
+                                1CD02E400B66C75400957AF0 /* highlightsNormalMedium.png */,
+                                1CD02E410B66C75400957AF0 /* highlightsNormalSmall.png */,
+                                1CD02E420B66C75400957AF0 /* messagesInvertedLarge.png */,
+                                1CD02E430B66C75400957AF0 /* messagesInvertedMedium.png */,
+                                1CD02E440B66C75400957AF0 /* messagesInvertedSmall.png */,
+                                1CD02E450B66C75400957AF0 /* messagesNormalLarge.png */,
+                                1CD02E460B66C75400957AF0 /* messagesNormalMedium.png */,
+                                1CD02E470B66C75400957AF0 /* messagesNormalSmall.png */,
+                                1CD02E480B66C75400957AF0 /* rowHighlight.png */,
-                        );
-                        path = Resources;
@@ -223 +262 @@
-                                1C3458F20905FC4F00AC2C16 /* base.css in Resources */,
-                                1CF3AE700B5B05B100183925 /* smallIcon.png in Resources */,
+                                1CD02E490B66C75400957AF0 /* highlightsInvertedLarge.png in Resources */,
+                                1CD02E4A0B66C75400957AF0 /* highlightsInvertedMedium.png in Resources */,
+                                1CD02E4B0B66C75400957AF0 /* highlightsInvertedSmall.png in Resources */,
+                                1CD02E4C0B66C75400957AF0 /* highlightsNormalLarge.png in Resources */,
+                                1CD02E4D0B66C75400957AF0 /* highlightsNormalMedium.png in Resources */,
+                                1CD02E4E0B66C75400957AF0 /* highlightsNormalSmall.png in Resources */,
+                                1CD02E4F0B66C75400957AF0 /* messagesInvertedLarge.png in Resources */,
+                                1CD02E500B66C75400957AF0 /* messagesInvertedMedium.png in Resources */,
+                                1CD02E510B66C75400957AF0 /* messagesInvertedSmall.png in Resources */,
+                                1CD02E520B66C75400957AF0 /* messagesNormalLarge.png in Resources */,
+                                1CD02E530B66C75400957AF0 /* messagesNormalMedium.png in Resources */,
+                                1CD02E540B66C75400957AF0 /* messagesNormalSmall.png in Resources */,
+                                1CD02E550B66C75400957AF0 /* rowHighlight.png in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;