From c2d82ec6d70df76440d69ea6a3431c25806f5e9c Mon Sep 17 00:00:00 2001 From: robo-bo Date: Tue, 30 Aug 2022 01:49:59 +0300 Subject: [PATCH] Orc is work! --- .../pyOpenRPA/Orchestrator/ServerSettings.py | 2 +- .../pyOpenRPA/Resources/Web/orpa/footer.xhtml | 4 +- .../pyOpenRPA/Resources/Web/orpa/header.xhtml | 103 +- .../pyOpenRPA/Resources/Web/orpa/orc.xhtml | 5 +- .../Resources/Web/orpa/styleset/button.css | 3848 ------------- .../Resources/Web/orpa/styleset/container.css | 157 - .../Resources/Web/orpa/styleset/divider.css | 270 - .../Resources/Web/orpa/styleset/grid.css | 2049 ------- .../Resources/Web/orpa/styleset/home.css | 50 +- .../Resources/Web/orpa/styleset/icon.css | 4816 ----------------- .../Resources/Web/orpa/styleset/image.css | 320 -- .../Resources/Web/orpa/styleset/list.css | 963 ---- .../Resources/Web/orpa/styleset/menu.css | 2062 ------- .../Web/orpa/{ => styleset}/metadata.json | 0 .../Resources/Web/orpa/styleset/reset.css | 495 -- .../Resources/Web/orpa/styleset/sidebar.css | 638 --- .../Resources/Web/orpa/styleset/site.css | 214 - .../Web/orpa/styleset/transition.css | 2069 ------- 18 files changed, 109 insertions(+), 17956 deletions(-) delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/button.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/container.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/divider.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/grid.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/icon.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/image.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/list.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/menu.css rename Sources/pyOpenRPA/Resources/Web/orpa/{ => styleset}/metadata.json (100%) delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/reset.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/sidebar.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/site.css delete mode 100644 Sources/pyOpenRPA/Resources/Web/orpa/styleset/transition.css diff --git a/Sources/pyOpenRPA/Orchestrator/ServerSettings.py b/Sources/pyOpenRPA/Orchestrator/ServerSettings.py index 4cb04674..64f4326c 100644 --- a/Sources/pyOpenRPA/Orchestrator/ServerSettings.py +++ b/Sources/pyOpenRPA/Orchestrator/ServerSettings.py @@ -464,7 +464,7 @@ gRender = Render(inTemplatePathStr=lFileStr,inTemplateRefreshBool=True) def pyOpenRPA_Index(): # Пример использования global gRender - lStr = gRender.Generate() + lStr = gRender.Generate(inDataDict={"title":"ОРКЕСТРАТОР", "subtitle":"ПАНЕЛЬ УПРАВЛЕНИЯ"}) __Orchestrator__.WebRequestResponseSend(inResponeStr=lStr,inContentTypeStr="text/html") def SettingsUpdate(inGlobalConfiguration): diff --git a/Sources/pyOpenRPA/Resources/Web/orpa/footer.xhtml b/Sources/pyOpenRPA/Resources/Web/orpa/footer.xhtml index e470ebca..7d778547 100644 --- a/Sources/pyOpenRPA/Resources/Web/orpa/footer.xhtml +++ b/Sources/pyOpenRPA/Resources/Web/orpa/footer.xhtml @@ -13,13 +13,13 @@

Интересный факт

-

Этот сайт сделан на оркестраторе pyOpenRPA за 7 дней - присоединяйся к сильной стороне!

+

Портал pyOpenRPA сделан на оркестраторе pyOpenRPA за 7 дней - присоединяйся к сильной стороне!

Контактная информация

ООО "ОПЕН РПА", ОГРН 1227700251350

МСК: 125310, Россия, г. Москва, улица Муравская

-

СПБ: 197022, Россия, г. Санкт-Петербург, улица Льва Толстого

+

СПБ: 197022, Россия, г. Санкт-Петербург, Аптекарский проспект, 18

Центр поддержки клиентов: +7 995 233 45 31 (с 9:00 до 18:00 по МСК), support@pyopenrpa.ru

Оказываем услуги на всей территории Российской Федерации

diff --git a/Sources/pyOpenRPA/Resources/Web/orpa/header.xhtml b/Sources/pyOpenRPA/Resources/Web/orpa/header.xhtml index b6ed17db..45e1d7c0 100644 --- a/Sources/pyOpenRPA/Resources/Web/orpa/header.xhtml +++ b/Sources/pyOpenRPA/Resources/Web/orpa/header.xhtml @@ -17,33 +17,84 @@ -
-
-
-
- -
-
-

- {{const}} -

-

- {% if const %} - ФИО: {{const}} - {% else %} - НАИМЕНОВАНИЕ: {{const}} - {% endif %} - -

-

ИНН: - {% if const %} - {{const}} - {% else %} - {{const}} - {% endif %} -

+ +
+ +
+ + + + +
+
+
+
+ +
+
+

+ {{title}} +

+

+ {{subtitle}} + +

+
+
- diff --git a/Sources/pyOpenRPA/Resources/Web/orpa/orc.xhtml b/Sources/pyOpenRPA/Resources/Web/orpa/orc.xhtml index a27b873a..5ceef70f 100644 --- a/Sources/pyOpenRPA/Resources/Web/orpa/orc.xhtml +++ b/Sources/pyOpenRPA/Resources/Web/orpa/orc.xhtml @@ -4,6 +4,7 @@ pyOpenRPA Orchestrator + @@ -58,8 +59,10 @@ + + {% include 'header.xhtml' %}
- {% include 'header.xhtml' %} +