Skip to content

Commit

Permalink
formatting of templates
Browse files Browse the repository at this point in the history
  • Loading branch information
ninianne98 committed Mar 20, 2016
1 parent 7ff5877 commit fc2b34e
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 148 deletions.
4 changes: 2 additions & 2 deletions CMSAdmin/abundant/abundant.master
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Conversion to CarrotCake CMS Template: Carrotware
<div id="wrapper">
<div id="header">
<div id="menu-wrapper">
<carrot:TwoLevelNavigation runat="server" ID="TwoLevelNavigation1" FontSize="14px" ForeColor="#FFFFFF" SelBGColor="#9D0708" HoverBGColor="#D4260B"
SubBGColor="#8E1318" />
<carrot:TwoLevelNavigation runat="server" ID="TwoLevelNavigation1" FontSize="14px" ForeColor="#FFFFFF" SelBGColor="#9D0708"
HoverBGColor="#D4260B" SubBGColor="#8E1318" />
</div>
<!-- end #menu -->
</div>
Expand Down
5 changes: 1 addition & 4 deletions CMSAdmin/abundant/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ hr {
padding-left: 30px;
}


#menu {
float: left;
}
Expand Down Expand Up @@ -367,7 +366,6 @@ hr {
color: #FFFFFF;
}


#sidebar p {
line-height: 200%;
padding-bottom: 20px;
Expand Down Expand Up @@ -443,7 +441,6 @@ hr {
color: #FFFFFF;
}


.pagerfooterlinks {
line-height: normal;
}
Expand All @@ -470,4 +467,4 @@ hr {
.pagerfooterlinks .selectedwrap {
background-color: #DA5C08;
font-weight: bold;
}
}
15 changes: 9 additions & 6 deletions CMSAdmin/citrus-island/citrus1-post.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ Conversion to CarrotCake CMS Template: Carrotware
<div style="clear: both;">
</div>
<div id="sidebar">
<carrot:SiteMetaWordList ID="SiteMetaWordList1" HeadWrapTag="h1" runat="server" ContentType="Category" MetaDataTitle="Categories" CssClass="sidemenu" />
<carrot:SiteMetaWordList ID="SiteMetaWordList1" HeadWrapTag="h1" runat="server" ContentType="Category" MetaDataTitle="Categories"
CssClass="sidemenu" />
<carrot:SiteMetaWordList ID="SiteMetaWordList2" HeadWrapTag="h1" runat="server" ContentType="Tag" MetaDataTitle="Tags" CssClass="sidemenu" />
<carrot:WidgetContainer ID="phLeftTop" runat="server" />
<carrot:ContentContainer EnableViewState="false" ID="BodyLeft" TextZone="TextLeft" runat="server" />
Expand All @@ -74,7 +75,8 @@ Conversion to CarrotCake CMS Template: Carrotware
<div style="clear: both;">
</div>
<p>
<carrot:PostMetaWordList HtmlTagNameInner="span" HtmlTagNameOuter="span" ID="wpl1" runat="server" ContentType="Category" MetaDataTitle="Categories:" />
<carrot:PostMetaWordList HtmlTagNameInner="span" HtmlTagNameOuter="span" ID="wpl1" runat="server" ContentType="Category"
MetaDataTitle="Categories:" />
<br />
<carrot:PostMetaWordList HtmlTagNameInner="span" HtmlTagNameOuter="span" ID="wpl2" runat="server" ContentType="Tag" MetaDataTitle="Tags:" />
</p>
Expand Down Expand Up @@ -105,8 +107,8 @@ Conversion to CarrotCake CMS Template: Carrotware
<asp:TextBox runat="server" ID="CommenterURL" Columns="30" MaxLength="100" ValidationGroup="ContentCommentForm" />
<label>
comment:
<asp:CustomValidator ID="CustomValidator1" runat="server" ValidationGroup="ContentCommentForm" ControlToValidate="VisitorComments" ClientValidationFunction="__carrotware_ValidateLongText"
EnableClientScript="true" ErrorMessage="**" />
<asp:CustomValidator ID="CustomValidator1" runat="server" ValidationGroup="ContentCommentForm" ControlToValidate="VisitorComments"
ClientValidationFunction="__carrotware_ValidateLongText" EnableClientScript="true" ErrorMessage="**" />
</label>
<asp:TextBox runat="server" ID="VisitorComments" TextMode="MultiLine" Rows="8" Columns="40" MaxLength="1024" />
<div class="padding10">
Expand Down Expand Up @@ -159,7 +161,8 @@ Conversion to CarrotCake CMS Template: Carrotware
<div class="pagerfooterlinks">
</PagerHeaderTemplate>
<PagerTemplate>
<carrot:ListItemWrapperForPager HtmlTagName="div" ID="ListItemWrapperForPager1" runat="server" CSSSelected="selectedwrap" CssClassNormal="pagerlink">
<carrot:ListItemWrapperForPager HtmlTagName="div" ID="ListItemWrapperForPager1" runat="server" CSSSelected="selectedwrap"
CssClassNormal="pagerlink">
<carrot:NavLinkForPagerTemplate ID="lnkBtn" CSSSelected="selected" runat="server" />
</carrot:ListItemWrapperForPager>
</PagerTemplate>
Expand Down Expand Up @@ -218,4 +221,4 @@ Conversion to CarrotCake CMS Template: Carrotware
</asp:Panel>
</form>
</body>
</html>
</html>
6 changes: 4 additions & 2 deletions CMSAdmin/citrus-island/citrus1.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ Conversion to CarrotCake CMS Template: Carrotware
<div style="clear: both;">
</div>
<div id="sidebar">
<carrot:ChildNavigation MetaDataTitle="Child Pages" HeadWrapTag="h1" CssClass="sidemenu" CSSSelected="active" runat="server" ID="ChildNavigation1" />
<carrot:SiblingNavigation MetaDataTitle="In This Section" HeadWrapTag="h1" CssClass="sidemenu" CSSSelected="active" runat="server" ID="SiblingNavigation1" />
<carrot:ChildNavigation MetaDataTitle="Child Pages" HeadWrapTag="h1" CssClass="sidemenu" CSSSelected="active" runat="server"
ID="ChildNavigation1" />
<carrot:SiblingNavigation MetaDataTitle="In This Section" HeadWrapTag="h1" CssClass="sidemenu" CSSSelected="active" runat="server"
ID="SiblingNavigation1" />
<carrot:WidgetContainer ID="phLeftTop" runat="server" />
<carrot:ContentContainer EnableViewState="false" ID="BodyLeft" TextZone="TextLeft" runat="server" />
<carrot:WidgetContainer ID="phLeftBottom" runat="server" />
Expand Down

0 comments on commit fc2b34e

Please sign in to comment.