Merge branch 'master' of https://gitee.com/zxyabc/COMONE

4 years ago · 1c849d06e2
20 changed files with 444 additions and 84 deletions
--- a/SCP/Default1.aspx
+++ b/SCP/Default1.aspx
@ -1,61 +1,161 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default1.aspx.cs" Inherits="SCP.Default1" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default1.aspx.cs" Inherits="SCP.Default1"   ValidateRequest="true" %>

-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

 <html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
+<head id="Head1" runat="server">
+    <title>SCP供应商协同管理系统</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><style type="text/css">
+<!--
+body {
+	background-image: url(res/images/login_bg_1.jpg);
+	margin-left: 0px;
+	margin-top: 0px;
+	margin-right: 0px;
+	margin-bottom: 0px;
+	background-repeat: repeat-x;
+}
+td{
+	font-size:12px;
+	line-height:20px;
+}
+
+.login{
+	
+}
+
+.login tr td{
+	font-size:12px;
+	line-height:20px;
+}
+-->
+</style></head>
 <body>
-        <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server"></f:PageManager>
-        <f:Window ID="Window1" runat="server" IsModal="true" Hidden="false" EnableClose="false"
-            EnableMaximize="false" WindowPosition="GoldenSection" Icon="Key" Title="系统登陆"
-            Layout="HBox" BoxConfigAlign="Stretch" BoxConfigPosition="Start" Width="500px">
-            <Items>
-                <f:Image ID="imageLogin" ImageUrl="~/res/images/login/login_2.png" runat="server"
-                    CssClass="login-image">
-                </f:Image>
-                <f:SimpleForm ID="SimpleForm1" LabelAlign="Top" BoxFlex="1" runat="server"
-                    BodyPadding="30px 20px" ShowBorder="false" ShowHeader="false">
-                    <Items>               
-                        <f:TextBox ID="tbxUserName" FocusOnPageLoad="true" runat="server" Label="帐号" Required="true"
-                            ShowRedStar="true" Text="">
-                        </f:TextBox>
-                        <f:TextBox ID="tbxPassword" TextMode="Password" runat="server" Required="true" ShowRedStar="true"
-                            Label="密码" Text=""/>
-                         <f:DropDownList Hidden="true" ID="DDL_LANGUAGE" Label="语 言" runat="server" Required="true" ShowRedStar="true"  OnSelectedIndexChanged="DDL_LANGUAGE_SelectedIndexChanged">
-                              <f:ListItem Text="中文" Selected="true" Value="CH"/>
-                              <f:ListItem Text="English" Value="EN" />
-                              <f:ListItem Text="Deutsch" Value="DE"/>
-                              <f:ListItem Text="日本語" Value="JP" />
-                              <f:ListItem Text="Français" Value="FR" />
-                        </f:DropDownList>
-                        
-                
-                              <%--  <f:FormRow ID="FormRow2" runat="server">
-                                    <Items>
-                                        <f:NumberBox runat="server" ID="TXT_VerifyCode"></f:NumberBox>
-                                      <f:Image ImageUrl="Handlers/MakeVerifyCode.ashx" runat="server"></f:Image>
-                                    </Items>
-                                </f:FormRow>--%>
-                            
-                    </Items>
-                </f:SimpleForm>
-                
-            </Items>
-            <Toolbars>
-                <f:Toolbar runat="server" Position="Bottom" ToolbarAlign="Right">
-                    <Items>
-                        <f:Button ID="btnSubmit" Icon="LockOpen" Type="Submit" runat="server" ValidateForms="SimpleForm1"
-                            OnClick="btnSubmit_Click" Text="登陆">
-                        </f:Button>
-                    </Items>
-                </f:Toolbar>
-            </Toolbars>
-        </f:Window>
+    <form id="form1" runat="server">
+    <div>
+      <table width="959" height="86" border="0" align="center" cellpadding="0" cellspacing="0" background="res/images/login_title.jpg">
+        <tr>
+          <td align="center" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td align="right">&nbsp;</td>
+            </tr>
+          </table></td>
+        </tr>
+      </table>
+      <table width="959" border="0" align="center" cellpadding="0" cellspacing="0">
+        <tr>
+          <td width="648"><img src="res/images/20210302140650.png" width="648" height="368" style="box-shadow:0px 15px 10px -15px #000;" /></td>
+          <td width="311"><table width="311" height="390" border="0" align="right" cellpadding="0" cellspacing="0" background="res/images/login_form.jpg">
+            <tr>
+              <td><table width="90%" border="0" align="center" cellpadding="5" cellspacing="0" class="login" id="login">
+                <tr>
+                  <td width="31%">&nbsp;</td>
+                  <td width="69%">&nbsp;</td>
+                </tr>
+                <tr>
+                  <td>&nbsp;</td>
+                  <td>&nbsp;</td>
+                </tr>
+                 <tr>
+                  <td align="right">厂名</td>
+                  <td>
+                      
+                   
+            
+                    <select id="factory" runat="server"  onchange="getFactory();" style="width:120px;font-size:10px">
+
+                    </select> 
+                 
+                     
+                    </td>
+                </tr>
+                <tr>
+                  <td align="right">账号</td>
+                  <td>
+                      
+                      <asp:TextBox ID="txtUserName" runat="server" style="width:120px" Text=""></asp:TextBox>
+                    </td>
+                </tr>
+                <tr>
+                  <td align="right" >密码</td>
+                  <td>
+                      <asp:TextBox ID="txtPassword" runat="server" style="width:120px" Text="" TextMode="Password"></asp:TextBox>
+                    </td>
+                </tr>
+<%--                <tr>--%>
+<%--                  <td align="right">验证码</td>--%>
+<%--                  <td>--%>
+<%--                      <asp:TextBox ID="txtCode" runat="server"  Width="68px"></asp:TextBox>--%>
+<%--					          <img src="handle/Code.ashx" name="imgVerify" align="absmiddle" id="imgVerify" onclick="this.src=this.src+'?'+Math.random();"/>                    </td>--%>
+<%--                </tr>--%>
+                <tr>
+                  <td align="right">&nbsp;</td>
+                  <td>
+                      &nbsp;
+                    </td>
+                </tr>
+                <tr>
+                  <td colspan="2" align="center">
+                      <asp:ImageButton ID="ImageButton1" runat="server" 
+                          ImageUrl="~/res/images/btnLogin.jpg" onclick="ImageButton1_Click" />                    </td>
+                  </tr>
+              </table></td>
+            </tr>
+          </table></td>
+        </tr>
+      </table>
+    </div>
+    <br />
+    <br />
+        <asp:Label id="Label1" runat="server"></asp:Label>
+        <asp:Label id="Label2" runat="server"></asp:Label>
+    <br />
+    <br />
+    <br />
+    <asp:HiddenField ID="factoryValue" runat="server"/>
+      
+ 			
+       
+
+
+    <center><font size="2px"><p id="p1" runat="server"><%= GetResourceKey("适用浏览器：360、FireFox、搜狗、谷歌等. 不支持IE10及以下浏览器") %>。</p></font></center>
+    <br />
+    <center><font size="2px"> <a href="https://get.adobe.com/reader/?loc=cn" target="_blank" title="供应商请先安装报表插件下载" id="A1" runat="server">
+                <%= GetResourceKey("供应商请先安装报表插件下载") %></a></font></center>
+  
    </form>
+    <script type="text/javascript" src="res/js/jQuery1.js"></script>
+<script type="text/javascript" src="res/js/fun.base.js"></script>
+<script type="text/javascript" src="res/js/script.js"></script>
+<script type="text/javascript">
+    var _factoryValue = '<%= factoryValue.ClientID %>';
+    window.onload = function () {
+        var obj = document.getElementById('factory');
+
+        for (var i = 0; obj.options.length; i++) {
+            if ('QDVALEO' == obj.options[i].value) {
+                obj.options[i].selected = true;
+                _factory = document.getElementById(_factoryValue);
+                _factory.value = 'QDVALEO';
+            }
+        }
+    }
+
+
+    function keyDown(e) {
+        var ev = window.event || e;
+        if (ev.keyCode == 13) {
+            document.getElementById("btn_Login").focus();
+        }
+    }
+    function getFactory() {
+        _factory = document.getElementById(_factoryValue);
+        var obj = document.getElementById('factory');
+        var index = obj.selectedIndex; //序号，取当前选中选项的序号
+        var val = obj.options[index].value;
+        _factory.value = val;

+    }
+    </script>
 </body>
 </html>
--- a/SCP/Default1.aspx.cs
+++ b/SCP/Default1.aspx.cs
@ -5,13 +5,228 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;

+
+using System.Data;
+
+using System.Web.Security;
+using FineUI;
+using System.Text;
+
+using CK.SCP.Models.AppBoxEntity;
+
+using CK.SCP.Models.ScpEntity;
+using CK.SCP.Controller;
+using System.Text.RegularExpressions;
+using CK.SCP.Models;
+using CK.SCP.Utils;
+using CK.SCP.Common;
+using System.Configuration;
+using SCP.Code;
+
+
+
 namespace SCP
 {
    public partial class Default1 : PageBase
    {
        protected void Page_Load(object sender, EventArgs e)
        {
+            if (!IsPostBack)
+            {
+                GetFactoryName();
+                var _username = Request.QueryString["t"];
+                var _email = Request.QueryString["u"];
+                if (string.IsNullOrEmpty(_username) && string.IsNullOrEmpty(_email))
+                {
+                    LoadData();
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(_username) && !string.IsNullOrEmpty(_email))
+                    {
+                        var _name = Encryption64.Decrypt(_username, DateTime.Now.ToString("yyyyMMdd"));
+                        var _mail = Encryption64.Decrypt(_email, DateTime.Now.ToString("yyyyMMdd"));
+                        if (string.IsNullOrEmpty(_name) || string.IsNullOrEmpty(_mail))
+                        {
+                            LoadData();
+                        }
+                        else
+                        {
+                            User user = DB.Users.Where(u => u.Name == _name && u.Email == _mail).FirstOrDefault();
+                            user.UsedDomain = factoryValue.Value;
+                            if (user != null)
+                            {
+                                if (!user.Enabled)
+                                {
+                                    Alert.Show(GetResourceKey("用户未启用，请联系管理员！"));
+                                }
+                                else
+                                {
+                                    LoginSuccess(user);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+        private void LoadData()
+        {
+            // 如果用户已经登录，则重定向到管理首页
+            if (User.Identity.IsAuthenticated)
+            {
+                Response.Redirect(FormsAuthentication.DefaultUrl);
+            }
+        }
+        protected string GetFactoryName()
+        {
+
+
+            var _list = SCPDB.TB_FACTORY.ToList();
+            //dp_List.DataTextField = "FactoryName";
+            //dp_List.DataValueField= "ErpDomain";
+            //dp_List.DataSource =_list;
+            //dp_List.DataBind();
+
+
+            factory.DataTextField = "FactoryName";
+            factory.DataValueField = "ErpDomain";
+            factory.DataSource = _list;
+            factory.DataBind();
+
+            string _content = "闻荫科技有限公司";
+            TA_CONFIG _cf = SCPDB.TA_CONFIG.FirstOrDefault(p => p.ParamName == ("工厂名称"));
+            if (_cf != null)
+            {
+                _content = _cf.ParamValue;
+            }
+            return _content;
+        }
+        protected void ImageButton1_Click(object sender, ImageClickEventArgs e)
+        {
+            //用户登录
+            try
+            {
+
+                string userName = txtUserName.Text.Trim();
+                string password = txtPassword.Text.Trim();
+                LoadResouce();
+                Login(userName, password);
+
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        private void Login(string p_userName, string p_password)
+        {
+            if (string.IsNullOrEmpty(txtUserName.Text) || string.IsNullOrEmpty(txtPassword.Text))
+            {
+                Alert.Show(GetResourceKey("用户名或密码不能为空!"));
+                return;
+            }
+            User user = DB.Users.Where(u => u.Name == p_userName).FirstOrDefault();
+
+            if (user != null)
+            {
+                if (PasswordUtil.ComparePasswords(user.Password, p_password))
+                {
+
+                    if (!user.Enabled)
+                    {
+                        Alert.Show(GetResourceKey("用户未启用，请联系管理员！"));
+                    }
+                    else
+                    {
+                      
+                        var _factoryList = DB.Users.Where(itm => itm.Name == user.Name).FirstOrDefault().TA_FACTORY.Select(p => p.FactoryId).ToList();
+                        user.UsedDomain = factoryValue.Value;
+                        if (_factoryList.Contains(factoryValue.Value))
+                        {
+                            // 登录成功
+                            LoginSuccess(user);
+                        }
+                        else
+                        {
+                            Alert.Show("不选定工厂下供应商");
+                            return;
+                        }
+                        return;
+                    }
+                }
+                else
+                {
+                    Alert.Show(GetResourceKey("用户名或密码错误！"));
+                    return;
+                }
+            }
+            else
+            {
+                Alert.Show(GetResourceKey("用户名或密码错误！"));
+                return;
+            }
+        }
+        //获取登录的用户信息
+        public static UserLoginInfo UserInfo
+        {
+            get
+            {
+                if (HttpContext.Current.Session["user"] != null)
+                {
+                    return (UserLoginInfo)HttpContext.Current.Session["user"];
+                }
+                return null;
+            }
+        }
+
+
+

+        private void LoginSuccess(User user)
+        {
+
+            RegisterOnlineUser(user);
+            // 用户所属的角色字符串，以逗号分隔
+            string roleIDs = String.Empty;
+            if (user.Roles != null)
+            {
+                roleIDs = String.Join(",", user.Roles.Select(r => r.ID).ToArray());
+            }
+            bool isPersistent = true;
+            DateTime expiration = DateTime.Now.AddMinutes(double.Parse(ConfigurationManager.AppSettings["SCP_TIME_OUT"]));
+            CreateFormsAuthenticationTicket(user.Name, roleIDs, isPersistent, expiration, user.UsedDomain);
+
+            var first = DB.Users.Where(p => p.Name == user.Name).FirstOrDefault();
+            if (first != null)
+            {
+                first.Remark = user.UsedDomain;
+                DB.SaveChanges();
+            }
+
+            // 重定向到登陆后首页
+            Response.Redirect(FormsAuthentication.DefaultUrl);
+        }
+        private void LoadResouce()
+        {
+            List<V_TA_LANGUAGE> _list = new List<V_TA_LANGUAGE>();
+            Application["LanguageList"] = ScpCache.LangauageList;
+        }
+
+
+        public class UserLoginInfo
+        {
+            public int UserID;
+            public string UserType;
+            public string UserName;
+            public string SupplierCode;
+            public string SupplierName;
+            public string FactoryCode;
+            public string FactoryName;
+            public string Authority;
+            public DataTable AuthorityData = null;
+            public bool LookPrice;
        }
    }
 }
--- a/SCP/Default1.aspx.designer.cs
+++ b/SCP/Default1.aspx.designer.cs
@ -7,11 +7,22 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace SCP {
-    
-    
-    public partial class Default1 {
-        
+namespace SCP
+{
+
+
+    public partial class Default1
+    {
+
+        /// <summary>
+        /// Head1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
        /// <summary>
        /// form1 控件。
        /// </summary>
@ -20,77 +31,86 @@ namespace SCP {
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
        /// <summary>
-        /// PageManager1 控件。
+        /// factory 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.PageManager PageManager1;
-        
+        protected global::System.Web.UI.HtmlControls.HtmlSelect factory;
+
        /// <summary>
-        /// Window1 控件。
+        /// txtUserName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.Window Window1;
-        
+        protected global::System.Web.UI.WebControls.TextBox txtUserName;
+
        /// <summary>
-        /// imageLogin 控件。
+        /// txtPassword 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.Image imageLogin;
-        
+        protected global::System.Web.UI.WebControls.TextBox txtPassword;
+
+        /// <summary>
+        /// ImageButton1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton ImageButton1;
+
        /// <summary>
-        /// SimpleForm1 控件。
+        /// Label1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.SimpleForm SimpleForm1;
-        
+        protected global::System.Web.UI.WebControls.Label Label1;
+
        /// <summary>
-        /// tbxUserName 控件。
+        /// Label2 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.TextBox tbxUserName;
-        
+        protected global::System.Web.UI.WebControls.Label Label2;
+
        /// <summary>
-        /// tbxPassword 控件。
+        /// factoryValue 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.TextBox tbxPassword;
-        
+        protected global::System.Web.UI.WebControls.HiddenField factoryValue;
+
        /// <summary>
-        /// DDL_LANGUAGE 控件。
+        /// p1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.DropDownList DDL_LANGUAGE;
-        
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl p1;
+
        /// <summary>
-        /// btnSubmit 控件。
+        /// A1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
-        protected global::FineUI.Button btnSubmit;
+        protected global::System.Web.UI.HtmlControls.HtmlAnchor A1;
    }
 }
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@ -215,10 +215,20 @@
    <Content Include="res\css\main1.css" />
    <Content Include="res\images\air-balloon-1.png" />
    <Content Include="res\images\air-balloon-2.png" />
+    <Content Include="res\images\btnLogin.jpg" />
+    <Content Include="res\images\collapse-all.gif" />
+    <Content Include="res\images\expand-all.gif" />
    <Content Include="res\images\login-bg.jpg" />
    <Content Include="res\images\login-foot.jpg" />
    <Content Include="res\images\login.png" />
+    <Content Include="res\images\login_bg.jpg" />
+    <Content Include="res\images\login_bg_1.jpg" />
+    <Content Include="res\images\login_content.jpg" />
+    <Content Include="res\images\login_form.jpg" />
+    <Content Include="res\images\login_title.jpg" />
    <Content Include="res\images\logo-login.png" />
+    <Content Include="res\images\logo.gif" />
+    <Content Include="res\images\new.gif" />
    <Content Include="res\js\DD_belatedPNG.js" />
    <Content Include="res\js\echarts.min.js" />
    <Content Include="res\js\fun.base.js" />
@ -2915,6 +2925,8 @@
    <Content Include="grf\SmallBarCode.grf" />
    <Content Include="grf\InvRecBill.grf" />
    <None Include="Properties\PublishProfiles\COM.pubxml" />
+    <Content Include="res\images\login_title - 副本.psd" />
+    <Content Include="res\images\login_title.psd" />
    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
    <Content Include="main.aspx" />
    <Content Include="Views\PlanData\ASN_STATE.aspx" />
@ -6465,6 +6477,8 @@
          <DevelopmentServerPort>62030</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
          <IISUrl>http://localhost:5678</IISUrl>
+          <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
+          <IISAppRootUrl>http://localhost:5678/</IISAppRootUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
--- a/SCP/Web.config
+++ b/SCP/Web.config
@ -80,7 +80,7 @@
 minFreeThreads="8" minLocalRequestFreeThreads="4" appRequestQueueLimit="100" enableVersionHeader="false"/>
    <customErrors mode="Off" />
    <authentication mode="Forms">
-      <forms name=".APPBOX_FORMS_AUTH" loginUrl="~/Default.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/" />
+      <forms name=".APPBOX_FORMS_AUTH" loginUrl="~/default1.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/" />
    </authentication>
    <authorization>
    
@ -156,6 +156,17 @@ minFreeThreads="8" minLocalRequestFreeThreads="4" appRequestQueueLimit="100" ena
  </location>
  <!--IIS7集成管道模式-->
  <system.webServer>
+
+    <httpProtocol>
+      <customHeaders>
+        <add  name="X-Content-Type-Options"  value="nosniff" />
+        <add  name="X-XSS-Protection" value="1" />
+      </customHeaders>
+    </httpProtocol>
+  
+
+
+
    <security>
      <!--<requestFiltering allowDoubleEscaping="true"/>-->
      <requestFiltering allowDoubleEscaping="true">
--- a/SCP/default.aspx
+++ b/SCP/default.aspx
@ -32,7 +32,7 @@
                   </div>  
 				</div>--%>
                 <div class="name" runat="server" id="div1"  >
-                    <label runat="server" id="Label1">工厂名称</label>
+                    <label runat="server" id="Label1">厂名</label>
                    <select id="factory" runat="server"  onchange="getFactory();">

                    </select> 
--- a/SCP/res/images/20210302140650.png
+++ b/SCP/res/images/20210302140650.png
--- a/SCP/res/images/btnLogin.jpg
+++ b/SCP/res/images/btnLogin.jpg
--- a/SCP/res/images/collapse-all.gif
+++ b/SCP/res/images/collapse-all.gif
--- a/SCP/res/images/expand-all.gif
+++ b/SCP/res/images/expand-all.gif
--- a/SCP/res/images/login_bg.jpg
+++ b/SCP/res/images/login_bg.jpg
--- a/SCP/res/images/login_bg_1.jpg
+++ b/SCP/res/images/login_bg_1.jpg
--- a/SCP/res/images/login_content.jpg
+++ b/SCP/res/images/login_content.jpg
--- a/SCP/res/images/login_form.jpg
+++ b/SCP/res/images/login_form.jpg
--- a/SCP/res/images/login_title
+++ b/SCP/res/images/login_title
--- a/SCP/res/images/login_title.jpg
+++ b/SCP/res/images/login_title.jpg
--- a/SCP/res/images/login_title.psd
+++ b/SCP/res/images/login_title.psd
--- a/SCP/res/images/logo.gif
+++ b/SCP/res/images/logo.gif
--- a/SCP/res/images/logo.png
+++ b/SCP/res/images/logo.png
--- a/SCP/res/images/new.gif
+++ b/SCP/res/images/new.gif