diff --git a/ChangeLog.md b/ChangeLog.md
index b1839a8b..34d76981 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,21 @@
# Changelog:
+* **23.12.18**
+ - Added query account management (since server 1.2.32b)
+
+* **18.12.18**
+ - Added bookmarks and bookmarks management
+ - Added query user visibility button and creation (Query management will follow soon)
+ - Fixed overflow within the group assignment dialog
+
+* **17.12.18**
+ - Implemented group prefix and suffix
+
+* **15.12.18**
+ - Implemented a translation system with default translated language sets for
+ - German
+ - Turkish
+ - Russian
+
* **3.12.18**
- Fixed url connect parameters
diff --git a/shared/css/control_bar.scss b/shared/css/control_bar.scss
index bad8261d..5b8188a3 100644
--- a/shared/css/control_bar.scss
+++ b/shared/css/control_bar.scss
@@ -103,9 +103,7 @@ $background:lightgray;
background-color: $background;
border-radius: 5px;
align-items: center;
- border: 2px solid rgba(0, 0, 0, 0);
-
- border-color: $border_color_activated;
+ border: 2px solid $border_color_activated;
width: 230px;
user-select: none;
@@ -134,6 +132,10 @@ $background:lightgray;
& > div:last-of-type {
border-radius: 0 0 2px 2px;
}
+
+ &.display_left {
+ margin-left: -165px;
+ }
}
&:hover {
@@ -142,4 +144,10 @@ $background:lightgray;
}
}
}
+
+ .bookmark-dropdown {
+ hr:last-child {
+ display: none;
+ }
+ }
}
\ No newline at end of file
diff --git a/shared/css/modal-query.scss b/shared/css/modal-query.scss
new file mode 100644
index 00000000..16c70228
--- /dev/null
+++ b/shared/css/modal-query.scss
@@ -0,0 +1,173 @@
+.query-create {
+ display: flex;
+ flex-direction: column;
+
+ .row-name {
+ width: 100%;
+
+ display: flex;
+ flex-direction: row;
+ justify-content: stretch;
+
+ input {
+ flex-grow: 1;
+ flex-shrink: 1;
+ margin-left: 5px;
+ }
+ }
+
+ .buttons {
+ margin-top: 5px;
+ text-align: right;
+ }
+}
+
+.query-created {
+ display: flex;
+ flex-direction: column;
+
+ .property-row {
+ width: 100%;
+
+ display: flex;
+ flex-direction: row;
+ justify-content: stretch;
+ align-items: center;
+
+ margin-top: 2px;
+
+ input {
+ flex-grow: 1;
+ flex-shrink: 1;
+ margin-left: 5px;
+ }
+
+ a:first-of-type {
+ width: 150px;
+ }
+
+ div:last-of-type {
+ margin-left: 5px;
+ cursor: pointer;
+ }
+ }
+
+ .buttons {
+ margin-top: 5px;
+ text-align: right;
+ }
+}
+
+.query-management {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+
+ .container {
+ display: flex;
+ flex-direction: column;
+ justify-content: stretch;
+
+ .header, .footer {
+ flex-grow: 0;
+ flex-shrink: 0;
+ }
+
+ .header {
+ display: flex;
+ flex-direction: row;
+ justify-content: stretch;
+
+ .buttons {
+ flex-grow: 0;
+ }
+
+ .search {
+ margin-left: 5px;
+ flex-grow: 1;
+
+ input {
+ width: 100%;
+ }
+ }
+ }
+
+ .query-list {
+ margin-top: 5px;
+
+ display: flex;
+ flex-grow: 1;
+ flex-direction: column;
+ justify-content: stretch;
+
+ .column {
+ &.column-username {
+ width: calc(50% - 75px)
+ }
+
+ &.column-unique-id {
+ width: calc(50% - 75px)
+ }
+
+ &.column-bound-server {
+ width: 150px;
+ flex-grow: 0;
+ }
+ }
+
+ .query-list-header {
+ flex-grow: 0;
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: row;
+ height: 20px;
+
+ .column {
+ border: 1px solid lightgray;
+ text-align: center;
+ }
+ }
+
+ .query-list-entries-container {
+ flex-grow: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: start;
+ overflow-y: auto;
+ min-height: 250px;
+
+ .entry {
+ display: flex;
+ flex-direction: row;
+
+ .column {
+ margin-left: 2px;
+ }
+
+ cursor: pointer;
+
+ &.selected {
+ background-color: blue;
+ }
+ }
+
+ &.scrollbar {
+ .column-username {
+ width: calc(50% - 75px + 30px)
+ }
+
+ .column-unique-id {
+ width: calc(50% - 75px + 30px)
+ }
+ }
+ }
+ }
+
+ .footer {
+ margin-top: 5px;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ }
+ }
+}
\ No newline at end of file
diff --git a/shared/css/modals.scss b/shared/css/modals.scss
index f69b52b5..4658a269 100644
--- a/shared/css/modals.scss
+++ b/shared/css/modals.scss
@@ -520,6 +520,7 @@
.group-list {
border: lightgray solid 1px;
padding: 3px;
+ overflow-y: auto;
.group-entry {
display: flex;
diff --git a/shared/css/ts/client.scss b/shared/css/ts/client.scss
index 21b82459..e05c6a6a 100644
--- a/shared/css/ts/client.scss
+++ b/shared/css/ts/client.scss
@@ -53,11 +53,21 @@
.channelTree div * {vertical-align: middle;display:inline-block;height: 16px;padding: 0px;}
.channelTree div img {border: 0;}
.channelTree div > span {position: absolute; right: 0;}
-.channelTree .name {
- vertical-align: middle;
- margin-top: 1px;
- height: 14px;
- display: inline;
+.channelTree {
+ .name, .group_prefix, .group_suffix, .away {
+ vertical-align: middle;
+ margin-top: 1px;
+ height: 14px;
+ display: inline;
+ }
+
+ .group_prefix {
+ margin-right: 3px;
+ }
+
+ .group_suffix {
+ margin-left: 3px;
+ }
}
.channelTree .own_name {
font-weight: bold;
diff --git a/shared/html/index.php b/shared/html/index.php
index f30960aa..4a9ba89d 100644
--- a/shared/html/index.php
+++ b/shared/html/index.php
@@ -50,6 +50,7 @@
+
diff --git a/shared/html/templates.html b/shared/html/templates.html
index 15c92438..364ab5d7 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -19,7 +19,24 @@
-
+
+
-
+9
+
+
+
+
+
+
+
+