From 62c3f8eddaef287a909f21de85ff852a67c7a716 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Fri, 31 May 2019 23:57:05 +0300 Subject: [PATCH 01/10] Improveing dlnaprofile layout page --- src/components/dialogHelper/dialoghelper.css | 4 +- src/dlnaprofile.html | 689 +++++++++---------- 2 files changed, 309 insertions(+), 384 deletions(-) diff --git a/src/components/dialogHelper/dialoghelper.css b/src/components/dialogHelper/dialoghelper.css index 2cc20b5ff2..04b5274d73 100644 --- a/src/components/dialogHelper/dialoghelper.css +++ b/src/components/dialogHelper/dialoghelper.css @@ -139,8 +139,8 @@ } .dialog-small { - width: 60%; - height: 80%; + width: 100%; + height: 100%; } .dialog-fullscreen-border { diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index 93c7207e4c..afa1e46c54 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -1,17 +1,13 @@
-
-
-

${HeaderProfileInformation}

${Help}
-
${TabInfo} ${TabDirectPlay} @@ -22,7 +18,6 @@

-
@@ -30,7 +25,6 @@
${LabelUserLibraryHelp}
-

${LabelSupportedMediaTypes}

@@ -62,7 +56,6 @@
${OptionIgnoreTranscodeByteRangeRequestsHelp}
-

${HeaderIdentificationCriteriaHelp}

@@ -102,7 +95,6 @@
${LabelIdentificationFieldHelp}
-

${HeaderHttpHeaders}

-

-
-
@@ -172,7 +161,6 @@
-

${HeaderProfileServerSettingsHelp}

@@ -218,19 +206,16 @@
-

${HeaderSubtitleProfilesHelp}

-

-
@@ -238,7 +223,6 @@ -
${XmlDocumentAttributeListHelp}
@@ -246,34 +230,33 @@
-

${HeaderDirectPlayProfileHelp}

- +

${HeaderTranscodingProfileHelp}

- +

${HeaderContainerProfileHelp}

- +

${HeaderCodecProfileHelp}

- +

${HeaderResponseProfileHelp}

- +
@@ -285,392 +268,334 @@ -
-
- -
-

${HeaderDirectPlayProfile}

-
- -
-
- -
- - -
- -
- - -
${LabelProfileContainersHelp}
-
- -
- - -
${LabelProfileCodecsHelp}
-
- -
- - -
${LabelProfileCodecsHelp}
-
- -

- - -

-
-
- -
-
- -
-

${HeaderTranscodingProfile}

-
- -
-
- -
- - - - -
-
- - - -

- - -

-
-
- -
-
- -
-

${HeaderContainerProfile}

-
- -
-
- -

${HeaderContainerProfileHelp}

- - - -
-
- - -
- -
- - +
+
${LabelProfileContainersHelp}
- -
- - - -

- - -

- +
+
+ +
${LabelProfileCodecsHelp}
+
+
+
+
+ +
${LabelProfileCodecsHelp}
+
+
+

+ + +

+ +
+
+
+
+
+
+

${HeaderTranscodingProfile}

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

+ + +

+
+
+
+
+
+
+
+

${HeaderContainerProfile}

+
+
+
+

${HeaderContainerProfileHelp}

+
+
+ +
+
+ +
${LabelProfileContainersHelp}
+
+
+ +

+ + +

+
+
-
- -
-

${HeaderCodecProfile}

+
+
+

${HeaderCodecProfile}

+
+
+
+

${HeaderCodecProfileHelp}

+
+ +
+
+ +
${LabelProfileCodecsHelp}
+
+

+ + +

+
+
- -
-
- -

${HeaderCodecProfileHelp}

- -
- - -
- -
- - -
${LabelProfileCodecsHelp}
-
- -

- - -

-
-
-
- -
-

${HeaderResponseProfile}

+
+
+

${HeaderResponseProfile}

+
+
+
+
+ +
+
+ +
${LabelProfileContainersHelp}
+
+
+
+ +
${LabelProfileCodecsHelp}
+
+
+
+
+ +
${LabelProfileCodecsHelp}
+
+
+

+ + +

+
+
- -
-
- -
- - -
- -
- - -
${LabelProfileContainersHelp}
-
- -
- - -
${LabelProfileCodecsHelp}
-
- -
- - -
${LabelProfileCodecsHelp}
-
- -

- - -

-
-
-
- -
-

${HeaderIdentificationHeader}

+
+
+

${HeaderIdentificationHeader}

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

+ + +

+
+
- -
-
- -
- - -
- -
- - -
- -
- - -
- -

- - -

-
-
-
- -
-

${HeaderXmlDocumentAttribute}

+
+
+

${HeaderXmlDocumentAttribute}

+
+
+
+
+ +
+
+ +
+

+ + +

+
+
- -
-
- -
- - -
- -
- - -
- -

- - -

-
-
-
-
- -
-

${HeaderSubtitleProfile}

+
+
+

${HeaderSubtitleProfile}

+
+
+
+
+ +
${LabelSubtitleFormatHelp}
+
+
+ +
+
+ +
+

+ + +

+
+
- -
-
- -
- - -
${LabelSubtitleFormatHelp}
-
- -
- - -
- -
- - -
- -

- - -

-
-
-
-
\ No newline at end of file +
From 3d07b51f4131d70a39f15f181d356a79054a3632 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Mon, 3 Jun 2019 02:46:44 +0300 Subject: [PATCH 02/10] change class dialog-small to dialog-medium-tall --- src/dlnaprofile.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index afa1e46c54..f7077daab7 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -272,7 +272,7 @@
-
+

${HeaderDirectPlayProfile}

@@ -314,7 +314,7 @@
-
+

${HeaderTranscodingProfile}

@@ -398,7 +398,7 @@
-
+

${HeaderContainerProfile}

@@ -432,7 +432,7 @@
-
+

${HeaderCodecProfile}

@@ -463,7 +463,7 @@
-
+

${HeaderResponseProfile}

@@ -505,7 +505,7 @@
-
+

${HeaderIdentificationHeader}

@@ -537,7 +537,7 @@
-
+

${HeaderXmlDocumentAttribute}

@@ -562,7 +562,7 @@
-
+

${HeaderSubtitleProfile}

From 6c6a02598ba4b55ad58e45993988e871f2923c5f Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Mon, 3 Jun 2019 02:48:31 +0300 Subject: [PATCH 03/10] Reverse back --- src/components/dialogHelper/dialoghelper.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dialogHelper/dialoghelper.css b/src/components/dialogHelper/dialoghelper.css index 04b5274d73..2cc20b5ff2 100644 --- a/src/components/dialogHelper/dialoghelper.css +++ b/src/components/dialogHelper/dialoghelper.css @@ -139,8 +139,8 @@ } .dialog-small { - width: 100%; - height: 100%; + width: 60%; + height: 80%; } .dialog-fullscreen-border { From f3667305f2067c3bdd04bdc0cb147415eb80fe16 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Mon, 3 Jun 2019 02:54:28 +0300 Subject: [PATCH 04/10] Fix button style --- src/dlnaprofile.html | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index f7077daab7..774cc4e906 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -303,10 +303,10 @@

- -

@@ -387,10 +387,10 @@

- -

@@ -421,10 +421,10 @@

- -

@@ -452,10 +452,10 @@
${LabelProfileCodecsHelp}

- -

@@ -494,10 +494,10 @@

- -

@@ -526,10 +526,10 @@

- -

@@ -551,10 +551,10 @@

- -

@@ -587,10 +587,10 @@

- -

From 314dc2bd97302f32427d2361e88e903c8aeb6607 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 5 Jun 2019 21:42:59 +0300 Subject: [PATCH 05/10] Remove bullet points --- src/controllers/dlnaprofile.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dlnaprofile.js index 530e456018..b28d638880 100644 --- a/src/controllers/dlnaprofile.js +++ b/src/controllers/dlnaprofile.js @@ -256,8 +256,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in currentType = profile.Type; } - html += "
  • "; - html += ''; + html += "
    "; + html += ''; html += "

    " + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "

    "; if ("Video" == profile.Type) { @@ -271,7 +271,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in html += "    "; html += 'Delete'; - html += "
    • "; + html += "
    "; } html += ""; @@ -316,8 +316,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in currentType = profile.Type; } - html += "
  • "; - html += ''; + html += "
    "; + html += ''; html += "

    Protocol: " + (profile.Protocol || "Http") + "

    "; html += "

    " + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "

    "; @@ -332,7 +332,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in html += "    "; html += 'Delete'; - html += "
    • "; + html += ""; } html += ""; @@ -402,8 +402,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in currentType = profile.Type; } - html += "
  • "; - html += ''; + html += "
    "; + html += ''; html += "

    " + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "

    "; if (profile.Conditions && profile.Conditions.length) { @@ -416,7 +416,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in html += "    "; html += 'Delete'; - html += "
    • "; + html += ""; } html += ""; @@ -474,8 +474,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in currentType = type; } - html += "
  • "; - html += ''; + html += "
    "; + html += ''; html += "

    " + Globalize.translate("ValueCodec").replace("{0}", profile.Codec || allText) + "

    "; if (profile.Conditions && profile.Conditions.length) { @@ -488,7 +488,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in html += "    "; html += 'Delete'; - html += "
    • "; + html += ""; } html += ""; @@ -545,8 +545,8 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in currentType = profile.Type; } - html += "
  • "; - html += ''; + html += "
    "; + html += ''; html += "

    " + Globalize.translate("ValueContainer").replace("{0}", profile.Container || allText) + "

    "; if ("Video" == profile.Type) { @@ -568,7 +568,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in html += "    "; html += 'Delete'; - html += "
    • "; + html += ""; } html += ""; From 061ef4e4582651efb4136eae99a3c1a90c9122bc Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 5 Jun 2019 22:31:04 +0300 Subject: [PATCH 06/10] change btn delete text to btn icon --- src/controllers/dlnaprofile.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controllers/dlnaprofile.js b/src/controllers/dlnaprofile.js index b28d638880..b4e320e6e4 100644 --- a/src/controllers/dlnaprofile.js +++ b/src/controllers/dlnaprofile.js @@ -270,7 +270,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += 'Delete'; + html += ''; html += ""; } @@ -331,7 +331,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += 'Delete'; + html += ''; html += ""; } @@ -415,7 +415,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += 'Delete'; + html += ''; html += ""; } @@ -487,7 +487,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += 'Delete'; + html += ''; html += ""; } @@ -567,7 +567,7 @@ define(["jQuery", "loading", "fnchecked", "emby-select", "emby-button", "emby-in } html += ""; - html += 'Delete'; + html += ''; html += ""; } From 6d5cf2d9754de6d8c523d5e8b5f3746e04c5e2e3 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Wed, 5 Jun 2019 23:54:57 +0300 Subject: [PATCH 07/10] changing class --- src/dlnaprofile.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index 774cc4e906..6a79178268 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -273,7 +273,7 @@
    -
    +

    ${HeaderDirectPlayProfile}

    @@ -315,7 +315,7 @@
    -
    +

    ${HeaderTranscodingProfile}

    @@ -399,7 +399,7 @@
    -
    +

    ${HeaderContainerProfile}

    @@ -433,7 +433,7 @@
    -
    +

    ${HeaderCodecProfile}

    @@ -464,7 +464,7 @@
    -
    +

    ${HeaderResponseProfile}

    @@ -506,7 +506,7 @@
    -
    +

    ${HeaderIdentificationHeader}

    @@ -538,7 +538,7 @@
    -
    +

    ${HeaderXmlDocumentAttribute}

    @@ -563,7 +563,7 @@
    -
    +

    ${HeaderSubtitleProfile}

    From 9b313d33783272282038f7e86d4c15197590600c Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 6 Jun 2019 01:17:19 +0300 Subject: [PATCH 08/10] fix some layout --- src/dlnaprofile.html | 522 +++++++++++++++++++++---------------------- 1 file changed, 253 insertions(+), 269 deletions(-) diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html index 6a79178268..bbda88586a 100644 --- a/src/dlnaprofile.html +++ b/src/dlnaprofile.html @@ -273,329 +273,313 @@
    -
    -
    +
    +

    ${HeaderDirectPlayProfile}

    - -
    - -
    +
    + +
    +
    + +
    ${LabelProfileContainersHelp}
    +
    +
    - -
    ${LabelProfileContainersHelp}
    + +
    ${LabelProfileCodecsHelp}
    -
    -
    - -
    ${LabelProfileCodecsHelp}
    -
    +
    +
    +
    + +
    ${LabelProfileCodecsHelp}
    -
    -
    - -
    ${LabelProfileCodecsHelp}
    -
    -
    -

    - - -

    - +
    +

    + + +

    -
    +
    -
    -
    +
    +

    ${HeaderTranscodingProfile}

    - -
    - - - - +
    + + + + +
    +
    +
    -
    -
    +
    +

    ${HeaderContainerProfile}

    - -

    ${HeaderContainerProfileHelp}

    -
    -
    - -
    -
    - -
    ${LabelProfileContainersHelp}
    -
    -
    - -

    - - -

    - -
    -
    -
    -
    -
    -
    -

    ${HeaderCodecProfile}

    -
    -
    -
    -

    ${HeaderCodecProfileHelp}

    +

    ${HeaderContainerProfileHelp}

    +
    - -
    -
    - -
    ${LabelProfileCodecsHelp}
    -
    -

    - - -

    - -
    -
    -
    -
    -
    -
    -

    ${HeaderResponseProfile}

    -
    -
    -
    -
    -
    - +
    ${LabelProfileContainersHelp}
    -
    -
    - -
    ${LabelProfileCodecsHelp}
    -
    -
    -
    -
    - -
    ${LabelProfileCodecsHelp}
    -
    -
    -

    - - -

    -
    +
    + +

    + + +

    -
    + +
    +
    +
    +
    +

    ${HeaderCodecProfile}

    +
    +
    +

    ${HeaderCodecProfileHelp}

    +
    + +
    +
    + +
    ${LabelProfileCodecsHelp}
    +
    +

    + + +

    +
    +
    +
    +
    +
    +
    +

    ${HeaderResponseProfile}

    +
    +
    +
    + +
    +
    + +
    ${LabelProfileContainersHelp}
    +
    +
    +
    + +
    ${LabelProfileCodecsHelp}
    +
    +
    +
    +
    + +
    ${LabelProfileCodecsHelp}
    +
    +
    +

    + + +

    +
    +
    -
    -
    +
    +

    ${HeaderIdentificationHeader}

    - -
    - -
    -
    - -
    -
    - -
    -

    - - -

    - +
    + +
    +
    + +
    +
    + +
    +

    + + +

    -
    +
    -
    -
    +
    +

    ${HeaderXmlDocumentAttribute}

    - -
    - -
    -
    - -
    -

    - - -

    - +
    + +
    +
    + +
    +

    + + +

    -
    +
    -
    -
    +
    +

    ${HeaderSubtitleProfile}

    - -
    - -
    ${LabelSubtitleFormatHelp}
    -
    -
    - -
    -
    - -
    -

    - - -

    - +
    + +
    ${LabelSubtitleFormatHelp}
    +
    +
    + +
    +
    + +
    +

    + + +

    -
    +
    From 2a3532f530242437daae8869a301a020110e3398 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 6 Jun 2019 01:17:56 +0300 Subject: [PATCH 09/10] fix btn layout --- src/scheduledtask.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/scheduledtask.html b/src/scheduledtask.html index ad47d8eb41..4024199c9b 100644 --- a/src/scheduledtask.html +++ b/src/scheduledtask.html @@ -23,9 +23,9 @@
    -
    +
    -
    +

    ${HeaderAddScheduledTaskTrigger}

    @@ -75,14 +75,14 @@
    - -
    -
    \ No newline at end of file +
    From cec86404436ef2c4922d2b300fce5069629681df Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 6 Jun 2019 01:18:19 +0300 Subject: [PATCH 10/10] add sytle --- src/css/dashboard.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/css/dashboard.css b/src/css/dashboard.css index 5a44c51f27..e3eaebd239 100644 --- a/src/css/dashboard.css +++ b/src/css/dashboard.css @@ -499,3 +499,8 @@ a[data-role=button] { -webkit-box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37); box-shadow: 0 .0725em .29em 0 rgba(0, 0, 0, .37) } + +.ui-bar-a{ + text-align: center; + padding: 0 20px; +}