Updates for bootstrap layout, changes to remove newtonsoft reference …

…in web.config.
ChrisHammond · Mar 3, 2016 · 51065ec · 51065ec
1 parent d10d195
commit 51065ec
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 219 deletions.
diff --git a/02.00.00.txt → 02.01.00.txt b/02.00.00.txt → 02.01.00.txt
diff --git a/DnnChat.csproj b/DnnChat.csproj
@@ -163,7 +163,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="02.00.00.txt" />
+    <Content Include="02.01.00.txt" />
     <Content Include="Data\SignalRChat-To-DnnChat.txt" />
     <Content Include="Edit.ascx" />
     <Content Include="images\defaultAvatar.png" />

diff --git a/DnnChat.dnn b/DnnChat.dnn
@@ -164,32 +164,7 @@
             </assembly>
           </assemblies>
         </component>
-        <component type="Cleanup" version="02.00.00" fileName="02.00.00.txt" />
-        <!--<component type="Config">
-          <config>
-            <configFile>web.config</configFile>
-            <install>
-              <configuration>
-                <nodes>
-                  --><!-- add assembly redirect for Newtonsoft.Json v6.0.0.0--><!--                
-                  <node path="/configuration/runtime/ab:assemblyBinding" action="update"
-                        targetpath="/configuration/runtime/ab:assemblyBinding[ab:dependentAssembly/ab:assemblyIdentity/@name='Newtonsoft.Json']"
-                        collision="ignore" nameSpace="urn:schemas-microsoft-com:asm.v1" nameSpacePrefix="ab">
-                    <dependentAssembly xmlns="urn:schemas-microsoft-com:asm.v1">
-                      <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
-                      <codeBase version="6.0.0.0" href="bin\dnnchat\Newtonsoft.Json.dll" />
-                    </dependentAssembly>
-                  </node>
-                </nodes>
-              </configuration>
-            </install>
-            <uninstall>
-              <configuration>
-                <nodes />
-              </configuration>
-            </uninstall>
-          </config>
-        </component>-->
+        <component type="Cleanup" version="02.01.00" fileName="02.01.00.txt" />
       </components>
     </package>
   </packages>

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -20,6 +20,7 @@
 	<ul>
 		<li>Updated for DNN 8 references</li>
 		<li>Removed NewtonSoft.Json custom references</li>
+		<li>Updated layout for more bootstrap/responsive properties.</li>
 	</ul>
 
 	<h3>About the dnnCHAT Module</h3>

diff --git a/View.ascx b/View.ascx
@@ -62,42 +62,46 @@
     </div>
 </div>
 
-<div class="ConnectedRoomList container" id="userRoomList">
+<ul class="nav nav-tabs col-lg-10" id="userRoomList">
     <!-- ko foreach: rooms -->
-    <div class="ChatRooms">
-        <div class="ConnectedRoomTab" data-bind="id:roomName,click:setActiveRoom,css:{activeRoom:roomId == $parent.activeRoom()}">
+    <li class="ChatRooms" data-bind="id:roomName,click:setActiveRoom,css:{'active':roomId == $parent.activeRoom()}" role="presentation">
+        <a href="#">
             <div data-bind="html:roomName" class="ConnectedRoom">
             </div>
             <div data-bind="html:formatCount(awayMessageCount())" class="roomAwayMessageCount"></div>
             <div data-bind="html:formatCount(awayMentionCount())" class="roomAwayMentionCount"></div>
-
-            <div data-bind="click:disconnectRoom" class="RoomClose"></div>
-        </div>
-    </div>
+            &nbsp;
+            <div data-bind="click:disconnectRoom" class="RoomClose glyphicon glyphicon-remove"></div>
+        </a>
+    </li>
     <!-- /ko -->
-</div>
+</ul>
 
 <div class="RoomContainer container" id="roomView">
     <!-- ko foreach: rooms -->
     <!-- the display of the rooms that a user is connected -->
-    <div class="srcWindow row" data-bind="visible:showRoom">
+    <div class="row" data-bind="visible:showRoom">
         <div class="col-lg-10 container chatWrap">
             <div class="ChatWindow" data-bind="attr:{id: roomNameId}">
-                <!-- ko foreach: messages -->
-                <div data-bind="attr:{class:cssName}" class="row">
-                    <div class="col-lg-2 MessageAuthor dnnClear">
-                        <!-- ko if: authorUserId>0 -->
-                        <img data-bind="attr: {src:photoUrl,alt:authorName},click:targetMessageAuthor" class="MessageAuthorPhoto" />
-                        <!-- /ko -->
-                        <!-- ko if: authorUserId<1 -->
-                        <img data-bind="attr: {src:defaultAvatarUrl,alt:authorName},click:targetMessageAuthor" class="MessageAuthorPhoto" />
-                        <!-- /ko -->
-                        <div data-bind="html:authorName,click:targetMessageAuthor" class="MessageAuthorText"></div>
-                    </div>
-                    <div data-bind="html:messageText" class="col-lg-9 MessageText "></div>
-                    <div data-bind="dateString: messageDate, click:deleteMessage" class=" col-lg-1 MessageTime"></div>
-                </div>
-                <!-- /ko -->
+                <ul class="list-group">
+                    <!-- ko foreach: messages -->
+                    <li class="list-group-item row">
+                        <div data-bind="attr:{class:cssName}">
+                            <div class="col-lg-2 MessageAuthor dnnClear">
+                                <!-- ko if: authorUserId>0 -->
+                                <img data-bind="attr: {src:photoUrl,alt:authorName},click:targetMessageAuthor" class="MessageAuthorPhoto" />
+                                <!-- /ko -->
+                                <!-- ko if: authorUserId<1 -->
+                                <img data-bind="attr: {src:defaultAvatarUrl,alt:authorName},click:targetMessageAuthor" class="MessageAuthorPhoto" />
+                                <!-- /ko -->
+                                <div data-bind="html:authorName,click:targetMessageAuthor" class="MessageAuthorText"></div>
+                            </div>
+                            <div data-bind="html:messageText" class="col-lg-9 MessageText "></div>
+                            <div data-bind="dateString: messageDate, click:deleteMessage" class=" col-lg-1 MessageTime"></div>
+                        </div>
+                    </li>
+                    <!-- /ko -->
+                </ul>
             </div>
             <input type="text" data-bind="value:newMessageText, hasfocus: textFocus, enterKey: sendMessage" class="msg" />
             <input class="dnnPrimaryAction" type="button" value="<%= Localization.GetString("btnSubmit.Text",LocalResourceFile)%>" data-bind="click:sendMessage" />
@@ -128,9 +132,9 @@
 
 
     </div>
-    
-
-    <div><a data-bind="attr:{href: roomArchiveLink}" target="_blank"><%=Localization.GetString("Archives.Text",LocalResourceFile) %></a></div>
+
+    <div><a data-bind="attr:{href: roomArchiveLink},visible:showRoom" target="_blank"><%=Localization.GetString("Archives.Text",LocalResourceFile) %></a></div>
+
     <!-- /ko -->
 </div>
 <div class="container">

diff --git a/install/DnnChat_02.01.00_Install.zip b/install/DnnChat_02.01.00_Install.zip
diff --git a/install/DnnChat_02.01.00_Source.zip b/install/DnnChat_02.01.00_Source.zip
diff --git a/module.css b/module.css
@@ -4,11 +4,12 @@
 
 .ChatWindow {
     max-height: 500px;
-    overflow: auto;
-    border: solid 1px #000;
+    overflow-y: auto;
+    /*border: solid 1px #000;
     vertical-align: baseline;
-    padding: 0;
+    padding: 0;*/
     overflow-x: hidden;
+    width: 100%;
 }
 
 .msg {
@@ -26,8 +27,9 @@
 }
 
 .UsersList {
-    border: solid 1px #000;
+    /*border: solid 1px #000;*/
     overflow: auto;
+    min-height: 300px;
 }
 
 .ArchiveDates {
@@ -39,7 +41,7 @@
 }
 
 .ChatMessage {
-    border-bottom: 1px solid #dbdbdb;
+
     position: relative;
     overflow: hidden;
 }
@@ -52,11 +54,13 @@
     height: 100%;
     text-align: right;
     font-size: .9em;
-}
+    }
 
 @media (min-width: 1200px) {
     .MessageAuthor {
         padding-right: 5px !important;
+        border-right: solid #dddddd 1px;
+        border-bottom: none;
     }
 }
 
@@ -65,7 +69,6 @@
     margin: 5px 0 5px 5px;
     border: solid 1px #000;
     width: 25px;
-    float: left;
     height: 25px;
 }
 
@@ -82,7 +85,7 @@
     -webkit-hyphens: auto;
     -moz-hyphens: auto;
     hyphens: auto;
-    border-left: solid 1px #dbdbdb;
+    /*border-left: solid 1px #dbdbdb;*/
 }
 
 @media (min-width: 1200px) {
@@ -141,7 +144,7 @@
 }
 
 .RoomClose {
-    background-image: url('../../images/close-icn.png');
+    /*background-image: url('../../images/close-icn.png');*/
     width: 24px;
     height: 24px;
     float: right;
@@ -202,4 +205,26 @@
 }
 
 .lblEndDate{ clear: both;}
-.endDate,.startDate { float: right;}
+.endDate,.startDate { float: right;}
+
+.nav-tabs{ border-bottom: none !important;}
+
+.ChatWindow .list-group {
+    width: 85%;
+}
+
+@media (min-width: 760px) {
+
+.ChatWindow .list-group {
+    width: 90%;
+}}
+
+
+@media (min-width: 969px) {
+
+.ChatWindow .list-group {
+    width: 96%;
+}}
+
+
+.ChatWindow li.list-group-item{ padding-top: 0!important;padding-bottom: 0 !important;}
diff --git a/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache