From 937d0f5579e263e5bf847ffdfd97e232fc27b01d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 27 Jun 2014 14:01:38 +0200 Subject: [PATCH] Add styles and template changes on ssearch part. --- app/partials/search.jade | 4 +- app/partials/views/modules/search-filter.jade | 33 ++++++++-------- app/partials/views/modules/search-in.jade | 7 ++-- .../views/modules/search-result-table.jade | 38 ++++++++++++------- app/styles/modules/search-filter.scss | 4 ++ app/styles/modules/search-result-table.scss | 7 ++++ 6 files changed, 58 insertions(+), 35 deletions(-) diff --git a/app/partials/search.jade b/app/partials/search.jade index c12da41f..8538d9f5 100644 --- a/app/partials/search.jade +++ b/app/partials/search.jade @@ -4,7 +4,9 @@ block head title Taiga Project management web application with scrum in mind! block content - div.wrapper + div.wrapper(tg-search, ng-controller="SearchController as ctrl", + ng-init="section='search'") + sidebar.menu-secondary.sidebar include views/modules/search-in diff --git a/app/partials/views/modules/search-filter.jade b/app/partials/views/modules/search-filter.jade index a1e9dd57..ee149e55 100644 --- a/app/partials/views/modules/search-filter.jade +++ b/app/partials/views/modules/search-filter.jade @@ -1,31 +1,30 @@ section.search-filter ul - li + li.userstories(data-name="userstories") a.active(href="#") span.icon.icon-bulk - | 20 User Stories + span.num 0 + span.name User Stories - li + li.issues(data-name="issues") a(href="#") span.icon.icon-issues - | 3 Issues + span.num 0 + span.name Issues - li + li.tasks(data-name="tasks") a(href="#") span.icon.icon-bulk - | 23 Task + span.num 0 + span.name Task - li + li.wiki(data-name="wiki") a(href="#") span.icon.icon-wiki - | 2 Wiki pages + span.num 0 + span.name Wiki Pages - li - a(href="#") - span.icon.icon-edit - | 12 Documents - - li - a(href="#") - span.icon.icon-edit - | 3 Users \ No newline at end of file + // li + // a(href="#") + // span.icon.icon-edit + // | 3 Users \ No newline at end of file diff --git a/app/partials/views/modules/search-in.jade b/app/partials/views/modules/search-in.jade index 9510a12f..ab323a37 100644 --- a/app/partials/views/modules/search-in.jade +++ b/app/partials/views/modules/search-in.jade @@ -1,6 +1,5 @@ section.search-in header - form - fieldset - input(type="text", placeholder="Search in...") - a.icon.icon-search(href="", title="search") + fieldset + input(type="text", placeholder="Search in...", ng-model="searchTerm") + a.icon.icon-search(href="", title="search") diff --git a/app/partials/views/modules/search-result-table.jade b/app/partials/views/modules/search-result-table.jade index 89d4553a..7929b13f 100644 --- a/app/partials/views/modules/search-result-table.jade +++ b/app/partials/views/modules/search-result-table.jade @@ -1,14 +1,26 @@ -section.search-result-table.basic-table - div.row.title - div.user-stories.width-4 User Stories - div.status.width-2 Status - div.points.width-1 Points - div.points.width-1 Sprints - - for (var x = 0; x < 50; x++) - div.row.table-main - div.user-stories.width-4 - div.user-story-name - a(href="") Crear el perfil de usuario Senior en el admin +section.search-result-table + div.search-result-table-header + div.row.title + div.user-stories.width-4 User Stories div.status.width-2 Status - div.points.width-1 12 - div.points.width-1 54 \ No newline at end of file + div.points.width-1 Points + div.points.width-1 Sprints + div.search-result-table-body + - for (var x = 0; x < 50; x++) + div.row.table-main + div.user-stories.width-4 + div.user-story-name + a(href="") Crear el perfil de usuario Senior en el admin + div.status.width-2 Status + div.points.width-1 12 + div.points.width-1 54 + + +script(type="text/ng-template", id="search-issues") + div.row.table-main(ng-repeat="issue in issues track by issue.id") + div.user-stories.width-4 + div.user-story-name + a(href="") Crear el perfil de usuario Senior en el admin + div.status.width-2 Status + div.points.width-1 12 + div.points.width-1 54 diff --git a/app/styles/modules/search-filter.scss b/app/styles/modules/search-filter.scss index d4611758..6ef3ab9c 100644 --- a/app/styles/modules/search-filter.scss +++ b/app/styles/modules/search-filter.scss @@ -21,4 +21,8 @@ .icon { margin-right: .4rem; } + + span.name { + padding-left: 5px; + } } diff --git a/app/styles/modules/search-result-table.scss b/app/styles/modules/search-result-table.scss index c17f79ce..2e72e88a 100644 --- a/app/styles/modules/search-result-table.scss +++ b/app/styles/modules/search-result-table.scss @@ -1,14 +1,21 @@ .search-result-table { + .row { + @include table-flex; &:hover { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); } + div { + @include table-flex-child(1, 0, 0); + } } .row-selected { background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); } + + // TODO: refactor xaviju .user-story-name { flex-basis: 500px; input {