Skip to content

Commit

Permalink
Making the branding bits something we can package/replace - Step 1 (s…
Browse files Browse the repository at this point in the history 
…vg icons, logo, favicon in separate files, ...)
  • Loading branch information
@InnaBoitsun
InnaBoitsun committed Nov 2, 2015
1 parent b579745 commit 2df8fd7
Show file tree
Hide file tree
Showing 28 changed files with 287 additions and 257 deletions.
2 changes: 1 addition & 1 deletion Website/Composite/Login.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Composite.Management</title>
<meta name="robots" content="noindex, nofollow" />
<meta http-equiv="X-UA-Compatible" content="IE=9" />
<link rel="shortcut icon" type="image/x-icon" href="images/icons/branding/favicon.ico" />
<% Response.WriteFile("favicon.inc"); %>

This comment has been minimized.

Sign in to view

Copy link
@burningice2866

burningice2866 Nov 3, 2015

Contributor

This is most likely not what you wanted... you should not write directly to the response when rendering a webforms-page... you risk the order of the html is screwed up when you have any server controls on the page.

You should instead put a asp:literal here, an bind its Text property from the OnLoad event with the content of the file read as File.ReadAllText
<control:styleloader runat="server"/>
<style type="text/css">
Expand Down
76 changes: 44 additions & 32 deletions Website/Composite/app.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@
</ui:menubody>
</ui:popup>
<ui:popup id="docktabpopup" binding="DockTabPopupBinding">
<ui:menubody>
<ui:menubody>
<ui:menugroup>
<ui:menuitem label="${string:Website.App.LabelCloseTab}" cmd="closetab" />
<ui:menuitem label="${string:Website.App.LabelCloseOthers}" cmd="closeothers" />
</ui:menugroup>
<ui:menugroup rel="developermode">
<ui:menuitem label="${string:Website.App.LabelRefreshView}" cmd="refreshview" />
<ui:menuitem label="${string:Website.App.LabelMakeDirty}" cmd="makedirty" />
</ui:menugroup>
</ui:menugroup>
<ui:menugroup rel="developermode">
<ui:menuitem label="${string:Website.App.LabelViewSource}" cmd="viewsource" />
<ui:menuitem label="${string:Website.App.LabelViewGenerated}" cmd="viewgenerated" />
<ui:menuitem label="${string:Website.App.LabelViewSerialized}" cmd="viewserialized" />
</ui:menugroup>
</ui:menugroup>
</ui:menubody>
</ui:popup>
<ui:popup id="dialogtitlebarpopup" binding="DialogTitleBarPopupBinding">
Expand Down Expand Up @@ -100,8 +100,8 @@
<ui:balloonset id="dialogballoonset" />

<ui:menubar id="menubar" class="menubar" binding="StageMenuBarBinding">
<%-- <ui:menu label="${string:Website.App.LabelFile}" >

<%-- <ui:menu label="${string:Website.App.LabelFile}" >
<ui:menupopup>
<ui:menubody>
<ui:menugroup>
Expand All @@ -115,7 +115,7 @@
</ui:menubody>
</ui:menupopup>
</ui:menu>--%>
<%-- <ui:menu label="${string:Website.App.LabelView}">
<%-- <ui:menu label="${string:Website.App.LabelView}">
<ui:menupopup>
<ui:menubody>
Expand Down Expand Up @@ -144,7 +144,7 @@
</ui:menubody>
</ui:menupopup>
</ui:menu>
<%-- <ui:menu label="${string:Website.App.LabelTools}">
<%-- <ui:menu label="${string:Website.App.LabelTools}">
<ui:menupopup>
<ui:menubody>
Expand All @@ -159,7 +159,12 @@
<ui:menuitem label="${string:Website.App.LabelFeedback}" image="${icon:feedback}" oncommand="window.open('http://users.composite.net/Feedback')" />
</ui:menugroup>
<ui:menugroup>
<ui:menuitem label="${string:Website.App.LabelAboutComposite}" oncommand="Commands.about()" image="${icon:company-composite}" />
<div class="brand-about-menuitem" onclick="Commands.about()">
<img alt="brand" src="images/branding/brand-icon.svg" />
<div class="menuitem-text">
<ui:text label="${string:Website.App.LabelAbout}"></ui:text><%=Composite.Core.Configuration.GlobalSettingsFacade.ApplicationName%>
</div>
</div>
</ui:menugroup>
</ui:menubody>
</ui:menupopup>
Expand Down Expand Up @@ -196,8 +201,15 @@
<ui:explorertoolbar>
<ui:toolbarbody align="left">
<ui:toolbargroup>
<ui:toolbarbutton id="compositebutton" class="logo" image="${icon:company-composite}" oncommand="EventBroadcaster.broadcast ( BroadcastMessages.START_COMPOSITE );" />
<ui:toolbarbutton id="menutogglebutton" class="menu-toggle" image="${icon:menu}" oncommand="top.app.bindingMap.explorermenu.toggle()" />
<div class="brand-name">
<div class="brand-icon">
<img src="images/branding/brand-icon.svg" alt="brand" onclick="EventBroadcaster.broadcast(BroadcastMessages.START_COMPOSITE);" />
</div>
<div class="brand-text">
<img src="images/branding/brand-text.svg" alt="brand" />
</div>
</div>
<ui:toolbarbutton id="menutogglebutton" class="menu-toggle" image="${icon:menu}" oncommand="top.app.bindingMap.explorermenu.toggle()" />
</ui:toolbargroup>
</ui:toolbarbody>
<ui:toolbarbody class="max">
Expand All @@ -206,7 +218,7 @@
</ui:explorertoolbar>
</ui:explorermenu>
</ui:explorer>
<ui:cover id="explorermenucover" transparent="true" busy="false" class="explorermenucover" onclick="top.app.bindingMap.explorermenu.collapse()"/>
<ui:cover id="explorermenucover" transparent="true" busy="false" class="explorermenucover" onclick="top.app.bindingMap.explorermenu.collapse()" />

<ui:cover id="stagesplittercover" hidden="true" transparent="true" busy="false" />
<ui:stagesplitterbody id="stagesplitterbody" class="binding" binding="StageSplitterBodyBinding" />
Expand All @@ -220,29 +232,29 @@
<ui:splitpanel>
<ui:splitbox id="appverticalsplitbox" orient="vertical" layout="3:1" persist="layout">
<ui:splitpanel>
<ui:decks id="maindecks">
<ui:deck id="startdeck">
<ui:decks>
<ui:deck>
<ui:dock id="startdock" reference="start" type="start">
<ui:docktabs>
<ui:docktab handle="Composite.Management.Start" />
</ui:docktabs>
<ui:dockpanels>
<ui:dockpanel />
</ui:dockpanels>
</ui:dock>
</ui:deck>
<ui:deck id="defaultstartdeck">
<ui:window id="defaultstartwindow" url="${root}/content/misc/defaultstart/defaultstart.aspx" />
</ui:deck>
</ui:decks>
<ui:decks id="maindecks">
<ui:deck id="startdeck">
<ui:decks>
<ui:deck>
<ui:dock id="startdock" reference="start" type="start">
<ui:docktabs>
<ui:docktab handle="Composite.Management.Start" />
</ui:docktabs>
<ui:dockpanels>
<ui:dockpanel />
</ui:dockpanels>
</ui:dock>
</ui:deck>
<ui:deck id="stagedeck">
<ui:cover id="stagedeckscover" busy="false" />
<ui:stagedecks id="stagedecks" />
<ui:deck id="defaultstartdeck">
<ui:window id="defaultstartwindow" url="${root}/content/misc/defaultstart/defaultstart.aspx" />
</ui:deck>
</ui:decks>
</ui:deck>
<ui:deck id="stagedeck">
<ui:cover id="stagedeckscover" busy="false" />
<ui:stagedecks id="stagedecks" />
</ui:deck>
</ui:decks>
</ui:splitpanel>
<ui:splitter />
<ui:splitpanel>
Expand Down Expand Up @@ -285,7 +297,7 @@
</ui:splitbox>
</ui:stage>
</ui:flexbox>
<%-- <ui:toolbar id="statusbar" binding="StageStatusBarBinding">
<%-- <ui:toolbar id="statusbar" binding="StageStatusBarBinding">
<ui:toolbarbody>
<ui:toolbargroup>
<ui:toolbarlabel id="statusbarlabel" />
Expand Down
2 changes: 1 addition & 1 deletion Website/Composite/content/dialogs/about/About.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var About = new function () {
var div1 = document.getElementById ( "version" );
var idfield = document.getElementById ( "id" );

div0.firstChild.data = div0.firstChild.data.replace ( "${pretty}", Installation.versionPrettyString );
div0.firstChild.data = div0.firstChild.data.replace ( "${pretty}", Installation.applicationName );
div1.firstChild.data = div1.firstChild.data.replace ( "${version}", Installation.versionString );
idfield.value = idfield.value.replace("${id}", Installation.installationID);

Expand Down
125 changes: 66 additions & 59 deletions Website/Composite/content/dialogs/about/about.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,75 @@

<%@ Page Language="C#" %>

<script runat="server">
string DialogTitle
{
get { return Composite.Core.ResourceSystem.LocalizationFiles.Composite_Management.Website_Dialogs_About_Title + " " + Composite.Core.Configuration.GlobalSettingsFacade.ApplicationName; }
}
</script>
<control:httpheaders runat="server" />
<head>
<title>Composite.Management.About</title>
<control:styleloader runat="server" />
<control:scriptloader type="sub" runat="server" />
<link rel="stylesheet" type="text/css" href="about.css.aspx" />
<script type="text/javascript" src="About.js"></script>
<title>Composite.Management.About</title>
<control:styleloader runat="server" />
<control:scriptloader type="sub" runat="server" />
<link rel="stylesheet" type="text/css" href="about.css.aspx" />
<script type="text/javascript" src="About.js"></script>
</head>
<body>
<ui:dialogpage label="${string:Website.Dialogs.About.Title}" image="${icon:company-composite}" height="auto" width="370" resizable="false">
<div id="about">
<div id="info">
<ui:cover id="infocover" busy="false" hidden="true" />
<div id="prettyversion">${pretty}</div>
<div id="version">Build no. ${version}</div>
<div id="copyright">© <%=DateTime.Now.Year%> Composite A/S</div>
<br />
<div>
<input id="id" value="${id}" onclick="this.select()" readonly="readonly" />
Installation ID:
</div>
</div>
<div id="credits">
<div id="roll">
<a href="http://www.composite.net/" target="wwwcompositenet">
<div class="logo" id="logo1" ></div>
</a>
<h2>Visual Editor</h2>
<p>
powered by<br />
<a href="http://tinymce.moxiecode.com/" title="Visit Moxicode" target="_blank">TinyMCE</a>
</p>
<h2>Source Editor</h2>
<p>
powered by<br />
<a href="http://codemirror.net/" title="Visit CodeMirror" target="_blank">CodeMirror</a>
</p>
<h2>Function Previews</h2>
<p>
powered by<br />
<a href="http://phantomjs.org/" title="Visit PhantomJS" target="_blank">PhantomJS</a>
</p>
<h2>SVG Icons</h2>
<p>
designed by<br />
<a href="http://www.orckestra.com/" title="Visit Orckestra" target="_blank">Orckestra</a><br />
<a href="http://www.freepik.com/" title="Visit Freepik" target="_blank">Freepik</a>
</p>
<div id="names" />
<div class="logo" id="logo2"></div>
</div>
</div>
<div id="fade"></div>
</div>
<ui:dialogtoolbar>
<ui:toolbarbody equalsize="true">
<ui:toolbargroup>
<ui:clickbutton id="buttonAccept" label="${string:Website.Dialogs.LabelAccept}" response="accept" focusable="true" default="true" class="pull-right"/>
<ui:clickbutton id="buttonCredits" label="${string:Website.Dialogs.About.LabelCredits}" focusable="true" oncommand="About.credits ()" />
</ui:toolbargroup>
</ui:toolbarbody>
</ui:dialogtoolbar>
</ui:dialogpage>
<ui:dialogpage label='<%= DialogTitle %>' height="auto" width="370" resizable="false">
<div id="about">
<div id="info">
<ui:cover id="infocover" busy="false" hidden="true" />
<div id="prettyversion">${pretty}</div>
<div id="version">Build no. ${version}</div>
<div id="copyright">© <%=DateTime.Now.Year%> Composite A/S</div>
<br />
<div>
<input id="id" value="${id}" onclick="this.select()" readonly="readonly" />
Installation ID:
</div>
</div>
<div id="credits">
<div id="roll">
<a href="http://www.composite.net/" target="wwwcompositenet">
<div class="logo" id="logo1"></div>
</a>
<h2>Visual Editor</h2>
<p>
powered by<br />
<a href="http://tinymce.moxiecode.com/" title="Visit Moxicode" target="_blank">TinyMCE</a>
</p>
<h2>Source Editor</h2>
<p>
powered by<br />
<a href="http://codemirror.net/" title="Visit CodeMirror" target="_blank">CodeMirror</a>
</p>
<h2>Function Previews</h2>
<p>
powered by<br />
<a href="http://phantomjs.org/" title="Visit PhantomJS" target="_blank">PhantomJS</a>
</p>
<h2>SVG Icons</h2>
<p>
designed by<br />
<a href="http://www.orckestra.com/" title="Visit Orckestra" target="_blank">Orckestra</a><br />
<a href="http://www.freepik.com/" title="Visit Freepik" target="_blank">Freepik</a>
</p>
<div id="names" />
<div class="logo" id="logo2"></div>
</div>
</div>
<div id="fade"></div>
</div>
<ui:dialogtoolbar>
<ui:toolbarbody equalsize="true">
<ui:toolbargroup>
<ui:clickbutton id="buttonAccept" label="${string:Website.Dialogs.LabelAccept}" response="accept" focusable="true" default="true" class="pull-right" />
<ui:clickbutton id="buttonCredits" label="${string:Website.Dialogs.About.LabelCredits}" focusable="true" oncommand="About.credits ()" />
</ui:toolbargroup>
</ui:toolbarbody>
</ui:dialogtoolbar>
</ui:dialogpage>
</body>
</html>
12 changes: 6 additions & 6 deletions Website/Composite/content/dialogs/about/about.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ ui|toolbargroup {
width: 100%;
text-align: center;
line-height: 20px;
padding-top: 220px;
padding-top: 200px;
padding-bottom: 100px;
}

div.logo {
cursor: pointer;
width: 168px;
height: 38px;
background: url("${root}/images/logo.png") no-repeat 0 0;
width: 250px;
height: 50px;
background: url("${root}/images/logo.png") no-repeat center center;
position: absolute;
top: 40px;
top: 20px;
left: 50%;
margin-left: -69px;
margin-left: -125px;
}

#logo2 {
Expand Down
6 changes: 3 additions & 3 deletions Website/Composite/default.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<title>Start Composite</title>
<meta name="robots" content="noindex, nofollow" />
<control:styleloader runat="server"/>
<link rel="shortcut icon" type="image/x-icon" href="images/icons/branding/favicon.ico" />
<% Response.WriteFile("favicon.inc"); %>
<script type="text/javascript" src="default.js"></script>
</head>
<body>
Expand All @@ -27,10 +27,10 @@
<div class="splash-inner">
<div class="logo"></div>
<div id="welcome">
<p>Welcome to your Composite C1 website. You can start the C1 Console or go back to your website <a href=".." title="Go to the main page">frontpage</a>.</p>
<p>Welcome to your <%= Composite.Core.Configuration.GlobalSettingsFacade.ApplicationName %> website. You can start the Console or go back to your website <a href=".." title="Go to the main page">frontpage</a>.</p>
</div>
<div id="start">
<a class="clickbutton mt-40" href="javascript:Composite.start();" title="Open Composite C1 in a new window">Start Composite C1</a>
<a class="clickbutton mt-40" href="javascript:Composite.start();" title="Open in a new window">Start <%= Composite.Core.Configuration.GlobalSettingsFacade.ApplicationName %></a>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions Website/Composite/develop.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<title>Start Developer Mode</title>
<meta name="robots" content="noindex, nofollow" />
<control:styleloader runat="server" />
<link rel="shortcut icon" type="image/x-icon" href="images/icons/branding/favicon.ico" />
<% Response.WriteFile("favicon.inc"); %>
<script type="text/javascript" src="default.js"></script>
<style type="text/css">
div#welcome {
Expand Down Expand Up @@ -54,14 +54,14 @@
<div class="splash-inner">
<div class="logo"></div>
<div id="welcome">
<p>Welcome to your Composite C1 website. You can start the C1 Console or go back to your website <a href=".." title="Go to the main page">frontpage</a>.</p>
<p>Welcome to your <%= Composite.Core.Configuration.GlobalSettingsFacade.ApplicationName %> website. You can start the Console or go back to your website <a href=".." title="Go to the main page">frontpage</a>.</p>
</div>
<div id="developermodeprb">
<p>C1 DeveloperMode has not been installed on this site.</p>
<p>Press <kbd>SHIFT</kbd> for OperationalMode</p>
</div>
<div id="start">
<a class="clickbutton mt-40" href="javascript:Composite.start(true);" title="Open Composite C1 in a new window">Start Developer Mode</a>
<a class="clickbutton mt-40" href="javascript:Composite.start(true);" title="Open in a new window">Start Developer Mode</a>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions Website/Composite/favicon.inc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<link rel="shortcut icon" type="image/x-icon" href="images/branding/favicon.ico" />
2 changes: 1 addition & 1 deletion Website/Composite/grunt.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h1>Setting up Grunt with Visual Studio 2015</h1>
<li>
<strong>You are done</strong>
<p>
<a href="top.aspx">Start Composite C1 console</a> and press F5 in your Browser.
<a href="top.aspx">Start console</a> and press F5 in your Browser.
</p>
</li>

Expand Down
2 changes: 1 addition & 1 deletion ...te/images/icons/svg/company-composite.svg → .../Composite/images/branding/brand-icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...e/Composite/images/C1_logo_text_small.svg → .../Composite/images/branding/brand-text.svg
View file
File renamed without changes
0 ...mposite/images/icons/branding/favicon.ico → ...ite/Composite/images/branding/favicon.ico
View file
File renamed without changes.
Loading

0 comments on commit 2df8fd7

Please sign in to comment.