Fixed bootstrap with actual V4. Had mistakenly copied in 3.3.7 someho…

…w....
ChrisHammond · Feb 10, 2019 · f9d44bf · f9d44bf
1 parent 07a3d73
commit f9d44bf
Show file tree

Hide file tree

Showing 22 changed files with 10,518 additions and 2,111 deletions.
diff --git a/Edit.ascx b/Edit.ascx
@@ -58,7 +58,7 @@
     </div>
 </div>
 
-<div id="CarouselPane" runat="server" class="carousel slide" containertype="G" containername="HammerFlex2" containersrc="Blank.ascx" />
+<div id="CarouselPane" runat="server" containertype="G" containername="HammerFlex2" containersrc="Blank.ascx" />
 
 
 <div class="container">
@@ -107,41 +107,3 @@
         </div>
     </div>
 </footer>
-
-<!-- gallery and carousel controls, hidden by default -->
-<!-- The Bootstrap Image Gallery lightbox, should be a child element of the document body -->
-<div id="blueimp-gallery" class="blueimp-gallery" data-use-bootstrap-modal="false">
-    <!-- The container for the modal slides -->
-    <div class="slides"></div>
-    <!-- Controls for the borderless lightbox -->
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
-    <!-- The modal dialog, which will be used to wrap the lightbox content -->
-    <div class="modal fade">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title"></h4>
-                </div>
-                <div class="modal-body next"></div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default pull-left prev">
-                        <i class="glyphicon glyphicon-chevron-left"></i>
-                        Previous
-                    </button>
-                    <button type="button" class="btn btn-primary next">
-                        Next
-                        <i class="glyphicon glyphicon-chevron-right"></i>
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
diff --git a/HammerFlex2.csproj b/HammerFlex2.csproj
@@ -109,10 +109,8 @@
     <Content Include="img\video-play.svg" />
     <Content Include="i\icon_message.png" />
     <Content Include="i\icon_notification.png" />
-    <Content Include="js\bootstrap-image-gallery.min.js" />
     <Content Include="js\bootstrap.js" />
     <Content Include="js\bootstrap.min.js" />
-    <Content Include="js\jquery.blueimp-gallery.min.js" />
     <Content Include="License.txt" />
     <Content Include="skin.css" />
     <Content Include="ReleaseNotes.txt" />

diff --git a/Home.ascx b/Home.ascx
@@ -13,38 +13,36 @@
 <dnn:META ID="mobileScale" runat="server" Name="viewport" Content="width=device-width,initial-scale=1" />
 
 <dnn:JQUERY ID="dnnjQuery" runat="server" jQueryHoverIntent="true" />
-<dnn:DnnJsInclude ID="bootstrapJS" runat="server" FilePath="js/bootstrap.min.js" PathNameAlias="SkinPath" Priority="10" />
-<dnn:DnnCssInclude ID="bootStrapCSS" runat="server" FilePath="css/bootstrap.min.css" PathNameAlias="SkinPath" Priority="14" />
+<dnn:DnnJsInclude ID="bootstrapJS" runat="server" FilePath="js/bootstrap.js" PathNameAlias="SkinPath" Priority="10" />
+<dnn:DnnCssInclude ID="bootStrapCSS" runat="server" FilePath="css/bootstrap.css" PathNameAlias="SkinPath" Priority="14" />
 
 
 
 <div class="navbar navbar-expand-lg sticky-top navbar-dark bg-primary" role="navigation">
     <div class="container">
-        <div class="navbar-header">
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="navbar-brand">
-                <dnn:LOGO runat="server" id="dnnLOGO" />
-            </div>
+
+        <div class="navbar-brand">
+            <dnn:LOGO runat="server" id="dnnLOGO" />
         </div>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
         <div class="navbar-collapse collapse" id="navbarResponsive">
             <dnn:MENU MenuStyle="BootStrapNav" runat="server"></dnn:MENU>
-
             <ul class="nav navbar-nav navbar-right">
                 <li>
                     <dnn:LOGIN ID="dnnLogin" CssClass="LoginLink" runat="server" LegacyMode="false" />
                 </li>
                 <li>
-                    <dnn:USER ID="dnnUser"  CssClass="LoginLink" runat="server" LegacyMode="false" />
+                    <dnn:USER ID="dnnUser" CssClass="LoginLink" runat="server" LegacyMode="false" />
                 </li>
             </ul>
         </div>
         <!--/.nav-collapse -->
     </div>
 </div>
 
-<div id="CarouselPane" runat="server" class="carousel slide" containertype="G" containername="HammerFlex2" containersrc="Blank.ascx" />
+<div id="CarouselPane" runat="server" containertype="G" containername="HammerFlex2" containersrc="Blank.ascx" />
 
 <div class="container">
     <!--/Logo-->
@@ -98,40 +96,3 @@
     </div>
 </footer>
 
-
-<!-- gallery and carousel controls, hidden by default -->
-<!-- The Bootstrap Image Gallery lightbox, should be a child element of the document body -->
-<div id="blueimp-gallery" class="blueimp-gallery" data-use-bootstrap-modal="false">
-    <!-- The container for the modal slides -->
-    <div class="slides"></div>
-    <!-- Controls for the borderless lightbox -->
-    <h3 class="pTitle"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
-    <!-- The modal dialog, which will be used to wrap the lightbox content -->
-    <div class="modal fade">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title"></h4>
-                </div>
-                <div class="modal-body next"></div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default pull-left prev">
-                        <i class="glyphicon glyphicon-chevron-left"></i>
-                        Previous
-                    </button>
-                    <button type="button" class="btn btn-primary next">
-                        Next
-                        <i class="glyphicon glyphicon-chevron-right"></i>
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
diff --git a/Resources.zip b/Resources.zip
diff --git a/SkinBase.cs b/SkinBase.cs
@@ -26,8 +26,6 @@ protected void Page_Load(object sender, EventArgs e)
         private void RegisterJavaScript()
         {
             jQuery.RequestRegistration();
-            //ClientResourceManager.RegisterScript(Page, "/portals/_default/skins/hammerflex/js/jquery.blueimp-gallery.min.js", FileOrder.Js.jQuery, "DnnFormBottomProvider"); // default priority and provider
-            //ClientResourceManager.RegisterScript(Page, "/portals/_default/skins/hammerflex/js/bootstrap-image-gallery.min.js", FileOrder.Js.jQuery, "DnnFormBottomProvider"); // default priority and provider           
 
         }
     }

diff --git a/install/HammerFlex2_00.00.01_Install.zip b/install/HammerFlex2_00.00.01_Install.zip
diff --git a/install/HammerFlex2_00.00.01_Source.zip b/install/HammerFlex2_00.00.01_Source.zip
diff --git a/js/bootstrap-image-gallery.js b/js/bootstrap-image-gallery.js
diff --git a/js/bootstrap-image-gallery.min.js b/js/bootstrap-image-gallery.min.js
diff --git a/js/bootstrap-image-gallery.min.js.map b/js/bootstrap-image-gallery.min.js.map