Skip to content

Commit

Permalink
Merge pull request #57 from i7MEDIA/dev
Browse files Browse the repository at this point in the history 
Merge Dev into Master
  • Loading branch information
@ElijahFowler
ElijahFowler committed Mar 20, 2017
2 parents db4ffc3 + 7be75b9 commit fe0fbab
Show file tree
Hide file tree
Showing 4,229 changed files with 409,740 additions and 934,755 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 2 additions & 4 deletions .gitignore
View file
Expand Up @@ -197,9 +197,6 @@ FakesAssemblies/

mojoportal-sts.sln

Web/Admin/PageManager.aspx
Web/Services/SiteMapJson.ashx

Web/App_GlobalResources/BingResources*
Web/App_GlobalResources/BlogResources*
Web/App_GlobalResources/CommentResources*
Expand Down Expand Up @@ -231,7 +228,6 @@ Web/App_GlobalResources/STSEventCal*
Web/App_GlobalResources/SiteMembershipResources*
Web/App_GlobalResources/stsAnalyticsResources*
Web/App_GlobalResources/FundRaiserResources*
Web/App_GlobalResources/PageManagerResources*
Web/App_GlobalResources/WebInvoiceResources*

Web/Data/*log*
Expand Down Expand Up @@ -397,3 +393,5 @@ Web/Setup/ProviderConfig/worldpayresponsehandlers/web-invoice-pro-worldpayrespon
packages/stspackages.txt
packages/repositories.config
packages/repositories.config

*.ini
137 changes: 69 additions & 68 deletions Web/Admin/AdminMenu.aspx
View file
Expand Up @@ -9,74 +9,75 @@
<portal:OuterBodyPanel ID="pnlOuterBody" runat="server">
<portal:InnerBodyPanel ID="pnlInnerBody" runat="server" CssClass="modulecontent">
<ul class="simplelist">
<li id="liSiteSettings" runat="server">
<asp:HyperLink ID="lnkSiteSettings" runat="server" CssClass="lnkSiteSettings" />
</li>
<li id="liSiteList" runat="server">
<asp:HyperLink ID="lnkSiteList" runat="server" CssClass="lnkSiteList" />
</li>
<li id="liSecurityAdvisor" runat="server" visible="false" class="liSecurityAdvisor">
<asp:HyperLink ID="lnkSecurityAdvisor" runat="server" CssClass="lnkSecurityAdvisor" />
<span class="secwarning">
<asp:image id="imgMachineKeyDanger" runat="server" Visible="false" CssClass="securitywarning" />
<mp:SiteLabel ID="lblNeedsAttantion" runat="server" CssClass="txterror needsattention" ConfigKey="NeedsAttention" UseLabelTag="false" Visible="false"></mp:SiteLabel>
</span>
</li>
<li id="liRoleAdmin" runat="server">
<asp:HyperLink ID="lnkRoleAdmin" runat="server" CssClass="lnkRoleAdmin" />
</li>
<li id="liPermissions" runat="server">
<asp:HyperLink ID="lnkPermissionAdmin" runat="server" CssClass="lnkPermissionAdmin" />
</li>
<li id="liMemberList" runat="server">
<asp:HyperLink ID="lnkMemberList" runat="server" CssClass="lnkMemberList" />
</li>
<li id="liAddUser" runat="server">
<asp:HyperLink ID="lnkAddUser" runat="server" CssClass="lnkAddUser" />
</li>
<li id="liPageTree" runat="server">
<asp:HyperLink ID="lnkPageTree" runat="server" CssClass="lnkPageTree" />
</li>
<li id="liContentManager" runat="server">
<asp:HyperLink ID="lnkContentManager" runat="server" CssClass="lnkContentManager" />
</li>
<li id="liContentWorkFlow" runat="server">
<asp:HyperLink ID="lnkContentWorkFlow" runat="server" CssClass="lnkContentWorkFlow" />
</li>
<li id="liContentTemplates" runat="server">
<asp:HyperLink ID="lnkContentTemplates" runat="server" CssClass="lnkContentTemplates" />
</li>
<li id="liStyleTemplates" runat="server">
<asp:HyperLink ID="lnkStyleTemplates" runat="server" CssClass="lnkStyleTemplates" />
</li>
<li id="liFileManager" runat="server">
<asp:HyperLink ID="lnkFileManager" runat="server" CssClass="lnkFileManager" />
</li>
<li id="liNewsletter" runat="server">
<asp:HyperLink ID="lnkNewsletter" runat="server" CssClass="lnkNewsletter" />
</li>
<li id="liRegistrationAgreement" runat="server">
<asp:HyperLink ID="lnkRegistrationAgreement" runat="server" CssClass="lnkRegistrationAgreement" />
</li>
<li id="liLoginInfo" runat="server">
<asp:HyperLink ID="lnkLoginInfo" runat="server" CssClass="lnkLoginInfo" />
</li>
<li id="liCoreData" runat="server">
<asp:HyperLink ID="lnkCoreData" runat="server" CssClass="lnkCoreData" />
</li>
<li id="liAdvancedTools" runat="server">
<asp:HyperLink ID="lnkAdvancedTools" runat="server" CssClass="lnkAdvancedTools" />
</li>
<li id="liLogViewer" runat="server">
<asp:HyperLink ID="lnkLogViewer" runat="server" CssClass="lnkLogViewer" />
</li>
<li id="liServerInfo" runat="server">
<asp:HyperLink ID="lnkServerInfo" runat="server" CssClass="lnkServerInfo" />
</li>
<li id="liCommerceReports" runat="server">
<asp:HyperLink ID="lnkCommerceReports" runat="server" CssClass="lnkCommerceReports" />
</li>
<asp:Literal ID="litSupplementalLinks" runat="server" />
<li id="liSiteSettings" runat="server">
<asp:HyperLink ID="lnkSiteSettings" runat="server" CssClass="lnkSiteSettings" />
</li>
<li id="liSiteList" runat="server">
<asp:HyperLink ID="lnkSiteList" runat="server" CssClass="lnkSiteList" />
</li>
<li id="liSecurityAdvisor" runat="server" visible="false" class="liSecurityAdvisor">
<asp:HyperLink ID="lnkSecurityAdvisor" runat="server" CssClass="lnkSecurityAdvisor" />
<span class="secwarning">
<asp:image id="imgMachineKeyDanger" runat="server" Visible="false" CssClass="securitywarning" />
<mp:SiteLabel ID="lblNeedsAttantion" runat="server" CssClass="txterror needsattention" ConfigKey="NeedsAttention" UseLabelTag="false" Visible="false"></mp:SiteLabel>
</span>
</li>
<li id="liRoleAdmin" runat="server">
<asp:HyperLink ID="lnkRoleAdmin" runat="server" CssClass="lnkRoleAdmin" />
</li>
<li id="liPermissions" runat="server">
<asp:HyperLink ID="lnkPermissionAdmin" runat="server" CssClass="lnkPermissionAdmin" />
</li>
<li id="liMemberList" runat="server">
<asp:HyperLink ID="lnkMemberList" runat="server" CssClass="lnkMemberList" />
</li>
<li id="liAddUser" runat="server">
<asp:HyperLink ID="lnkAddUser" runat="server" CssClass="lnkAddUser" />
</li>
<li id="liPageTree" runat="server">
<asp:HyperLink ID="lnkPageTree" runat="server" CssClass="lnkPageTree" />
</li>
<li id="liContentManager" runat="server">
<asp:HyperLink ID="lnkContentManager" runat="server" CssClass="lnkContentManager" />
</li>
<li id="liContentWorkFlow" runat="server">
<asp:HyperLink ID="lnkContentWorkFlow" runat="server" CssClass="lnkContentWorkFlow" />
</li>
<li id="liContentTemplates" runat="server">
<asp:HyperLink ID="lnkContentTemplates" runat="server" CssClass="lnkContentTemplates" />
</li>
<li id="liStyleTemplates" runat="server">
<asp:HyperLink ID="lnkStyleTemplates" runat="server" CssClass="lnkStyleTemplates" />
</li>
<portal:FileManagerLink runat="server" RenderAsListItem="true" CssClass="lnkFileManager" ListItemID="liFileManager" OpenInModal="false" QueryString="?view=fullpage" />
<%--<li id="liFileManager" runat="server">
<asp:HyperLink ID="lnkFileManager" runat="server" CssClass="lnkFileManager" />
</li>--%>
<li id="liNewsletter" runat="server">
<asp:HyperLink ID="lnkNewsletter" runat="server" CssClass="lnkNewsletter" />
</li>
<li id="liRegistrationAgreement" runat="server">
<asp:HyperLink ID="lnkRegistrationAgreement" runat="server" CssClass="lnkRegistrationAgreement" />
</li>
<li id="liLoginInfo" runat="server">
<asp:HyperLink ID="lnkLoginInfo" runat="server" CssClass="lnkLoginInfo" />
</li>
<li id="liCoreData" runat="server">
<asp:HyperLink ID="lnkCoreData" runat="server" CssClass="lnkCoreData" />
</li>
<li id="liAdvancedTools" runat="server">
<asp:HyperLink ID="lnkAdvancedTools" runat="server" CssClass="lnkAdvancedTools" />
</li>
<li id="liLogViewer" runat="server">
<asp:HyperLink ID="lnkLogViewer" runat="server" CssClass="lnkLogViewer" />
</li>
<li id="liServerInfo" runat="server">
<asp:HyperLink ID="lnkServerInfo" runat="server" CssClass="lnkServerInfo" />
</li>
<li id="liCommerceReports" runat="server">
<asp:HyperLink ID="lnkCommerceReports" runat="server" CssClass="lnkCommerceReports" />
</li>
<asp:Literal ID="litSupplementalLinks" runat="server" />
</ul>
</portal:InnerBodyPanel>
</portal:OuterBodyPanel>
Expand Down

0 comments on commit fe0fbab

Please sign in to comment.