diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js
index 487195755..b55a03da0 100644
--- a/openslides/assignments/static/js/assignments/base.js
+++ b/openslides/assignments/static/js/assignments/base.js
@@ -94,6 +94,14 @@ angular.module('OpenSlidesApp.assignments', [])
},
getAgendaTitle: function () {
return this.title;
+ },
+ // link name which is shown in search result
+ getSearchResultName: function () {
+ return this.getAgendaTitle();
+ },
+ // subtitle of search result
+ getSearchResultSubtitle: function () {
+ return "Election";
}
},
relations: {
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index d278a6923..618941d4e 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -199,25 +199,15 @@ img {
#nav .searchbar {
float: right;
margin-top: 35px;
+ display: inline-table;
}
-.searchbar .input-medium {
- float: left;
- height: 28px;
- width: 200px;
- border: 1px solid #ccc;
- padding: 0 5px;
- font-size: 14px;
+#nav .searchbar input {
+ width: 150px;
}
-.searchbar .btn {
- float: left;
- height: 30px;
- width: 30px;
+#nav .searchbar .btn {
background: #e8eaed;
- border: 1px solid #ccc;
- border-left: none;
- font-size: 14px;
color: #555;
}
@@ -617,6 +607,13 @@ img {
content: ":";
}
+/* search results */
+.searchresults li {
+ margin-bottom: 12px;
+}
+.searchresults li .subtitle {
+ color: #999999;
+}
/* ngDialog: override ngdialog-theme-default */
@@ -796,12 +793,19 @@ tr.selected td {
-/* display for resolutions smaller that 880px */
-@media only screen and (max-width: 880px) {
+/* display for resolutions smaller that 900px */
+@media only screen and (max-width: 900px) {
#nav .navbar li a { padding: 24px 5px; }
}
+/* display for resolutions smaller that 760px */
+@media only screen and (max-width: 760px) {
+
+ #nav .navbar li a { padding: 24px 2px; }
+ #nav .searchbar input { width: 100px; }
+}
+
/* display for resolutions smaller that 480px */
@media only screen and (max-width: 480px) {
@@ -821,7 +825,7 @@ tr.selected td {
#nav .navbar .button { display: block;}
#nav .navbar .button i { padding-top: 15px;}
#nav .searchbar { margin-top: 15px; }
- .searchbar .input-medium { width: 150px; }
+ #nav .searchbar input { width: 150px; }
#chatbox { width: 100%; top: 130px; }
.optional { /* hide optional column */
diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js
index cfb47e8b5..83c970df6 100644
--- a/openslides/core/static/js/core/base.js
+++ b/openslides/core/static/js/core/base.js
@@ -251,7 +251,15 @@ angular.module('OpenSlidesApp.core', [
},
getAgendaTitle: function () {
return this.title;
- }
+ },
+ // link name which is shown in search result
+ getSearchResultName: function () {
+ return this.getAgendaTitle();
+ },
+ // subtitle of search result
+ getSearchResultSubtitle: function () {
+ return "Agenda item";
+ },
},
relations: {
belongsTo: {
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 30f5f0a5d..e0f4fc54e 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -209,11 +209,13 @@ angular.module('OpenSlidesApp.core.site', [
abstract: true,
template: "