* BBCodeHelper.cs: usage of the "hidden" css class

to block/unblock  "show/hide" buttons 

* App.master: Javascript to block/unblock "show/hide" buttons 

* style.css: the hidden css class

* Estimate.aspx: jQuery moved to the default master page
This commit is contained in:
Paul Schneider
2015-03-04 18:26:39 +01:00
parent 721b11eba3
commit c77018c616
4 changed files with 17 additions and 7 deletions

View File

@ -268,6 +268,7 @@ namespace Yavsc.Helpers
TagBuilder aside = new TagBuilder ("aside");
aside.InnerHtml = ttb.ToString ();
aside.AddCssClass ("bshpanel");
aside.AddCssClass ("hidden");
bshd.InnerHtml = header.ToString()+aside.ToString();
return bshd.ToString ();

View File

@ -12,7 +12,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/Theme/style.css"/>
<link rel="icon" type="image/png" href="/favicon.png?v=2" />
<asp:ContentPlaceHolder id="head" runat="server">
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery-2.1.3.js")%>"></script>
<asp:ContentPlaceHolder id="head" runat="server">
</asp:ContentPlaceHolder>
<link href='http://fonts.googleapis.com/css?family=Dancing+Script:400,700' rel='stylesheet' type='text/css'/>
</head>
@ -81,7 +82,12 @@
</footer>
<script type="text/javascript">
var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
</script>
</script> <script>
$( ".bshd" ).on("click",function() {
$(this).children(".bshpanel").toggleClass("hidden");
$(this).children(".bsh").toggleClass("hidden");
});
</script>
</body>
</html>

View File

@ -134,7 +134,13 @@ padding-left: 20px;
max-height: 64px;
}
.hidden {
display:none;
}
.shoh { display:inline; }
.hiduh {
display:none;
}
@ -178,13 +184,11 @@ padding-left: 20px;
}
@media all and (max-width: 640px) {
.bshpanel { display:none; }
.bsh { display: inline; }
.bshd:hover .bshpanel {
.bshd:hover > .bshpanel {
display: block;
}
.bshd:hover .bsh {
.bshd:hover > .bsh {
display: none;
}
footer img {

View File

@ -1,7 +1,6 @@
<%@ Page Title="Devis" Language="C#" Inherits="System.Web.Mvc.ViewPage<Estimate>" MasterPageFile="~/Models/App.master" %>
<asp:Content ContentPlaceHolderID="head" ID="head1" runat="server" >
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery-2.1.3.js")%>"></script>
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.tablesorter.js")%>"></script>
<script type="text/javascript" src="<%=Url.Content("~/Scripts/jquery.validate.js")%>"></script>
<link rel="stylesheet" href="<%=Url.Content("~/Theme/dark/style.css")%>" type="text/css" media="print, projection, screen" />