Merge branch 'master' into hot-fix-select

B1naryStudio · Sep 2, 2015 · 85380bb · 85380bb
2 parents 6f2acf5 + 9c09f5f
commit 85380bb
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 9 deletions.
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
@@ -12,6 +12,7 @@ body.modal-open {
  | Main menu
  |------------------------------------------------------------------------------
  */
+
 .menu .user-panel {
     float: right;
     margin-right: 15px;
@@ -222,6 +223,10 @@ body.modal-open {
     right: 185px;
 }
 
+#userName {
+    white-space: nowrap;
+}
+
 /*
 |------------------------------------------------------------------------------
 | Questions list
@@ -259,6 +264,52 @@ body.modal-open {
     z-index: 0;
 }
 
+#question-list .help {
+    width: 330px;
+    position: absolute;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    z-index: 132;
+    background-color: #fff;
+    padding: 10px;
+    display: none;
+    top: 44px;
+    left: 50%;
+    margin-left: -165px;
+}
+
+#question-list .question-form:hover .help {
+    display: block;
+}
+
+#question-list .help:before {
+    border-left: 20px solid transparent;
+    border-right: 20px solid transparent;
+    border-bottom: 15px solid #fff;
+    margin-left: -30px;
+    position: absolute;
+    content: '';
+    width: 0;
+    height: 0;
+    left: 53%;
+    bottom: 100%;
+    z-index: 1;
+}
+
+#question-list .help:after {
+    border-left: 22px solid transparent;
+    border-right: 22px solid transparent;
+    border-bottom: 16px solid #ccc;
+    position: absolute;
+    content: '';
+    width: 0;
+    height: 0;
+    left: 53%;
+    bottom: 100%;
+    z-index: 0;
+    margin-left: -32px;
+}
+
 /*
  |------------------------------------------------------------------------------
  | Votes block
@@ -1369,6 +1420,16 @@ div .fa-05 {
     }
 }
 
+@media (max-width: 710px) {
+    #userName {
+        display: none;
+    }
+
+    #userProfile {
+        padding-right: 0;
+    }
+}
+
 @media (max-width: 767px) {
     .container {
         width: 96%;

diff --git a/public/js/locales/dev.json b/public/js/locales/dev.json
@@ -44,7 +44,8 @@
         "tagInfo": "To search by tags enter: ",
         "folderInfo": "To search by folders enter: ",
         "tagInfoSpan": "\"tag:tag title\"",
-        "folderInfoSpan": "\"folder:folder title\""
+        "folderInfoSpan": "\"folder:folder title\"",
+        "searchInfo": "To search by tags enter: \"tag:tag title\". <br> To search by folders enter: \"folder:folder title\""
     },
     "ui": {
         "save": "Save",

diff --git a/public/js/locales/en.json b/public/js/locales/en.json
@@ -43,7 +43,8 @@
         "tagInfo": "To search by tags enter: ",
         "folderInfo": "To search by folders enter: ",
         "tagInfoSpan": "\"tag:tag title\"",
-        "folderInfoSpan": "\"folder:folder title\""
+        "folderInfoSpan": "\"folder:folder title\"",
+        "searchInfo": "To search by tags enter: \"tag:tag title\". <br> To search by folders enter: \"folder:folder title\""
     },
     "ui": {
         "save": "Save",

diff --git a/public/js/locales/ru.json b/public/js/locales/ru.json
@@ -43,7 +43,8 @@
         "tagInfo": "Для поиска по тегам введите: ",
         "folderInfo": "Для поиска по папкам введите: ",
         "tagInfoSpan": "\"tag:название тега\"",
-        "folderInfoSpan": "\"folder:название папки\""
+        "folderInfoSpan": "\"folder:название папки\"",
+        "searchInfo": "Для поиска по тегам введите: \"tag:tag title\". <br> Для поиска по папкам введите: \"folder:folder title\""
     },
     "ui": {
         "save": "Сохранить",

diff --git a/public/js/locales/uk.json b/public/js/locales/uk.json
@@ -43,7 +43,8 @@
         "tagInfo": "Для пошуку по тегам введіть: ",
         "folderInfo": "Для пошуку по розділам введіть: ",
         "tagInfoSpan": "\"tag:назва тега\"",
-        "folderInfoSpan": "\"folder:назва розділу\""
+        "folderInfoSpan": "\"folder:назва розділу\"",
+        "searchInfo": "Для пошуку по тегам введіть: \"tag:tag title\". <br> Для пошуку по розділам введіть: \"folder:folder title\""
     },
     "ui": {
         "save": "Зберегти",

diff --git a/public/js/views/templates/question/collection.tpl b/public/js/views/templates/question/collection.tpl
@@ -1,7 +1,12 @@
-<form action="#">
+<form action="#" class="question-form">
     <div class="form-group">
         <div class="input-group address-control search">
             <input type="text"
+                   data-toggle="popover"
+                   data-placement="bottom"
+                   data-container="body"
+                   data-trigger="focus"
+
                    class="form-control"
                    name="search_query"
                    id="search-query"
@@ -12,12 +17,11 @@
                 </button>
             </span>
         </div>
-        <ul class="search-info">
-            <li><%= _t("search.tagInfo") %><span><%= _t("search.tagInfoSpan") %></span></li>
-            <li><%= _t("search.folderInfo") %><span><%= _t("search.folderInfoSpan") %></span></li>
-        </ul>
         <span class="help-block hidden"></span>
     </div>
+    <div class="help">
+        <%= _t("search.searchInfo") %>
+    </div>
 </form>
 
 <div class="questions-list">