# Lite rebranding - add new logo in web + favico.ico

5 years ago · fe19b15805
parent 6582366847
commit fe19b15805
7 changed files with 23 additions and 26 deletions
--- a/Sources/pyOpenRPA/Orchestrator/ServerSettings.py
+++ b/Sources/pyOpenRPA/Orchestrator/ServerSettings.py
@ -110,6 +110,7 @@ def SettingsUpdate(inGlobalConfiguration):
            {"Method":"GET", "URL": "/3rdParty/Handlebars/handlebars-v4.1.2.js", "MatchType": "EqualCase", "ResponseFilePath": os.path.join(lOrchestratorFolder, "..\\Resources\\Web\\Handlebars\\handlebars-v4.1.2.js"), "ResponseContentType": "application/javascript"},
            {"Method": "GET", "URL": "/Monitor/ControlPanelDictGet", "MatchType": "Equal", "ResponseDefRequestGlobal": Monitor_ControlPanelDictGet, "ResponseContentType": "application/json"},
            {"Method": "GET", "URL": "/GetScreenshot", "MatchType": "BeginWith", "ResponseDefRequestGlobal": GetScreenshot, "ResponseContentType": "image/png"},
+            {"Method": "GET", "URL": "/pyOpenRPA_logo.png", "MatchType": "Equal", "ResponseFilePath": os.path.join(lOrchestratorFolder, "..\\Resources\\Web\\pyOpenRPA_logo.png"), "ResponseContentType": "image/png"},
            {"Method": "GET", "URL": "/Orchestrator/RobotRDPActive/ControlPanelDictGet", "MatchType": "Equal","ResponseDefRequestGlobal": RobotRDPActive_ControlPanelDictGet, "ResponseContentType": "application/json"},
            {"Method": "POST", "URL": "/Orchestrator/UserRoleHierarchyGet", "MatchType": "Equal","ResponseDefRequestGlobal": UserRoleHierarchyGet, "ResponseContentType": "application/json"}
    ]
--- a/Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml
+++ b/Sources/pyOpenRPA/Orchestrator/Web/Index.xhtml
@ -705,16 +705,17 @@
 	<body>
 		<div class="ui internally celled grid">
 			<div class="row black">
-				<div class="three wide column">
-					<h1 class="ui header inverted">OpenRPA</h1>
-				</div>
-				<div class="eleven wide column">
+				<div class="sixteen wide column" style="display: flex;">
+					<img src="pyOpenRPA_logo.png" width="70px;" height="70px"></img>
+					&nbsp;&nbsp;&nbsp;
+					<h1 class="ui header inverted" style="cursor: pointer" onclick="window.open('https://gitlab.com/UnicodeLabs/OpenRPA','_blank');">pyOpenRPA</h1>
+					<h5 style="cursor: pointer" onclick="window.open('https://www.facebook.com/RU.IT4Business','_blank');">by Ivan Maslov</h5>
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
 					<h1 class="ui header inverted">Orchestrator Web GUI</h1>
 				</div>
-				<div class="two wide column">
-					<h5>by Ivan Maslov</h5>
-				</div>
-				
 			</div>
 			<div class="row">
 				<div class="sixteen wide column openrpa-control-panel-general" >
--- a/Sources/pyOpenRPA/Orchestrator/Web/favicon.ico
+++ b/Sources/pyOpenRPA/Orchestrator/Web/favicon.ico
--- a/Sources/pyOpenRPA/Resources/Web/pyOpenRPA_logo.png
+++ b/Sources/pyOpenRPA/Resources/Web/pyOpenRPA_logo.png
--- a/Sources/pyOpenRPA/Studio/Studio.py
+++ b/Sources/pyOpenRPA/Studio/Studio.py
@ -67,6 +67,9 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
        #Мост между файлом и http запросом (новый формат)
        if self.path == '/favicon.ico':
            self.SendResponseContentTypeFile('image/x-icon', os.path.join(lStudioFolder, "Web\\favicon.ico"))
+		#Мост между файлом и http запросом (новый формат)
+        if self.path == '/pyOpenRPA_logo.png':
+            self.SendResponseContentTypeFile('image/png', os.path.join(lStudioFolder, "..\\Resources\\Web\\pyOpenRPA_logo.png"))
    # POST
    def do_POST(self):
        #Restart studio
--- a/Sources/pyOpenRPA/Studio/Web/Index.xhtml
+++ b/Sources/pyOpenRPA/Studio/Web/Index.xhtml
@ -856,25 +856,17 @@
 	<body>
 		<div class="ui internally celled grid">
 			<div class="row black">
-				<div class="three wide column">
-					<h1>Studio</h1>
-					
+				<div class="sixteen wide column" style="display: flex;">
+					<img src="pyOpenRPA_logo.png" width="70px;" height="70px"></img>
+					&nbsp;&nbsp;&nbsp;
+					<h1 class="ui header inverted" style="cursor: pointer" onclick="window.open('https://gitlab.com/UnicodeLabs/OpenRPA','_blank');">pyOpenRPA</h1>
+					<h5 style="cursor: pointer" onclick="window.open('https://www.facebook.com/RU.IT4Business','_blank');">by Ivan Maslov</h5>
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
+					&nbsp;&nbsp;&nbsp;
+					<h1 class="ui header inverted">Orchestrator Web GUI</h1>
 				</div>
-				<div class="eleven wide column">
-					<div class="ui input">
-						<input class="openrpa-value-backend" type="text" placeholder="Backend win32 | uia" value="win32">
-					</div>
-					<button class="ui labeled icon button red" onclick="mGlobal.Actions.fRestartStudioServer();">
-						<i class="icon redo alternate"></i>
-						Restart Studio
-					</button>
-					<b style="font-size:10px;color: #b1b1b1;" >Backend: win32 or uia</b>
-				</div>
-				<div class="two wide column">
-					<h2 class="ui header inverted" style="margin-bottom:5px;">OpenRPA</h2>
-					<h5 style="margin-top:5px; cursor: pointer" onclick="window.open('http://UnicodeLabs.ru','_blank');">by UnicodeLabs</h5>
-				</div>
-				
 			</div>
 			<div class="row">
 				<div class="six wide column rpa-object-tree" >
--- a/Sources/pyOpenRPA/Studio/Web/favicon.ico
+++ b/Sources/pyOpenRPA/Studio/Web/favicon.ico