[Requirement #13278] Replace ClearCanvas logo

* Fixing layout of workstation and imageserver splash screen. --HG-- branch : Spock
parkjh2568 · Mar 25, 2015 · b95bef8 · b95bef8
1 parent 82541e9
commit b95bef8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 31 deletions.
diff --git a/ImageServer/Web/Application/App_Themes/Default/StyleSheets/Login.css b/ImageServer/Web/Application/App_Themes/Default/StyleSheets/Login.css
@@ -23,15 +23,15 @@
  font-weight: bold;
  font-family: Sans-Serif;
  font-size: 12px;
- bottom: 18px;
- right: 20px;
+ bottom: 50px;
+ right: 5px;
 }
 
 #Copyright
 {
  position:absolute;
- right:20px;
- bottom:5px; 
+ right:53px;
+ bottom:30px; 
  color:#24402E;
  font-size:x-small;
  font-family: Sans-Serif;
@@ -64,6 +64,7 @@
 .LoginButton
 {
  font-size: 12px;
+ width: 125px;
 }
 
 .LoginLabel
@@ -79,7 +80,7 @@
 {
  text-align: right;
  font-family: Arial,sans-serif;
- font-size: 14px;
+ font-size: xx-small;
  font-weight: bold;
  color: #205F87;
 }

diff --git a/ImageServer/Web/Application/Builds/SplashScreen/LoginSplash.png b/ImageServer/Web/Application/Builds/SplashScreen/LoginSplash.png
diff --git a/ImageServer/Web/Application/Pages/Login/Default.aspx b/ImageServer/Web/Application/Pages/Login/Default.aspx
@@ -83,17 +83,13 @@
  <table>
  <tr>
  <td align="right"><asp:Label ID="Label2" runat="server" Text="<%$Resources: Labels,UserID %>"></asp:Label></td>
- <td align="right"><asp:TextBox runat="server" ID="UserName" CssClass="LoginTextInput" AutoCompleteType="Disabled"></asp:TextBox></td>
+ <td align="right"><asp:TextBox runat="server" ID="UserName" CssClass="LoginTextInput" AutoCompleteType="Disabled" TabIndex="1"></asp:TextBox></td>
+ <td align="left"><asp:Button runat="server" ID="LoginButton" OnClick="LoginClicked" Text="<%$Resources: Labels,ButtonLogin %>" CssClass="LoginButton" TabIndex="3"/></td>
  </tr>
  <tr>
  <td align="right"><asp:Label ID="Label3" runat="server" Text="<%$Resources: Labels,Password %>"></asp:Label></td>
- <td align="right"><asp:TextBox runat="server" ID="Password" TextMode="Password" CssClass="LoginTextInput" AutoCompleteType="Disabled"></asp:TextBox></td>
- </tr> 
- <tr>
- <td colspan="2" align="right"><asp:Button runat="server" ID="LoginButton" OnClick="LoginClicked" Text="<%$Resources: Labels,ButtonLogin %>" CssClass="LoginButton"/></td>
- </tr> 
- <tr>
- <td colspan="2" align="right" ><asp:LinkButton ID="LinkButton1" runat="server" CssClass="LoginLink" OnClick="ChangePassword"><asp:Label ID="Label4" runat="server" Text="<%$Resources: Labels,ChangePassword%>"></asp:Label></asp:LinkButton></td> 
+ <td align="right"><asp:TextBox runat="server" ID="Password" TextMode="Password" CssClass="LoginTextInput" AutoCompleteType="Disabled" TabIndex="2"></asp:TextBox></td>
+ <td align="left"><asp:Button runat="server" ID="LinkButton1" OnClick="ChangePassword" Text="<%$Resources: Labels,ChangePassword %>" CssClass="LoginButton" TabIndex="4"/></td>
  </tr>
  </table>
  </div>

diff --git a/ImageServer/Web/Application/Pages/Login/Default.aspx.designer.cs b/ImageServer/Web/Application/Pages/Login/Default.aspx.designer.cs
diff --git a/ImageViewer/ImageViewer_critical.config b/ImageViewer/ImageViewer_critical.config
@@ -80,7 +80,7 @@
  <value>TopRight</value>
  </setting>
  <setting name="CopyrightLocation" serializeAs="String">
- <value>330, 330</value>
+ <value>346, 330</value>
  </setting>
  <setting name="CopyrightForeColor" serializeAs="String">
  <value>36, 64, 46</value>
@@ -134,7 +134,7 @@
  <value>TopRight</value>
  </setting>
  <setting name="CopyrightLocation" serializeAs="String">
- <value>330, 330</value>
+ <value>346, 330</value>
  </setting>
  <setting name="CopyrightForeColor" serializeAs="String">
  <value>36, 64, 46</value>

diff --git a/ImageViewer/View/WinForms/Resources/Splash.png b/ImageViewer/View/WinForms/Resources/Splash.png