zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes on latest merge

Browse source
This commit is contained in:
robvde 2012-08-09 09:11:01 +04:00
parent 6f75325b36
commit 8dc98d08aa
2 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx
View file

@ -25,9 +25,11 @@ function confirmation()
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="SubHead" style="width: 150px;"><asp:Label ID="lblDBInternalServer" runat="server" meta:resourcekey="lblDBInternalServer" Text="Internal Server:"></asp:Label></td>
<td class="Normal"><asp:Literal ID="litDBInternalServer" runat="server"></asp:Literal></td> <td class="Normal"><asp:Literal ID="litDBInternalServer" runat="server"></asp:Literal></td>
</tr> </tr>
<tr> <tr>
<td class="SubHead" style="width: 150px;"><asp:Label ID="lblDBExternalServer" runat="server" meta:resourcekey="lblDBExternalServer" Text="External Server:"></asp:Label></td>
<td class="Normal"><asp:Literal ID="litDBExternalServer" runat="server"></asp:Literal></td> <td class="Normal"><asp:Literal ID="litDBExternalServer" runat="server"></asp:Literal></td>
</tr> </tr>
</table> </table>

33
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs generated
View file

@ -1,7 +1,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:2.0.50727.3074
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -40,11 +39,43 @@ namespace WebsitePanel.Portal {
/// </remarks> /// </remarks>
protected global::WebsitePanel.Portal.UsernameControl usernameControl; protected global::WebsitePanel.Portal.UsernameControl usernameControl;
/// <summary>
/// lblDBInternalServer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDBInternalServer;
/// <summary> /// <summary>
/// litDBInternalServer control. /// litDBInternalServer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal litDBInternalServer; protected global::System.Web.UI.WebControls.Literal litDBInternalServer;
/// <summary>
/// lblDBExternalServer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDBExternalServer;
/// <summary>
/// litDBExternalServer control. /// litDBExternalServer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Literal litDBExternalServer; protected global::System.Web.UI.WebControls.Literal litDBExternalServer;
/// <summary>
/// secUsers control. /// secUsers control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>