valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 17:38:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add tiled class and adjust layout

Browse Source
This commit is contained in:
Zsolt Kocsmarszky 2017-11-14 21:32:22 +01:00
parent 2c2c626c42
commit c510b35b16
8 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/app/components/page-header/page-header.html
View File

@ -1,5 +1,5 @@
<div class="row p-10 p-l-15 p-r-15">
<div class="col-sm-9">
<div class="row bg-white tiled p-10 p-l-15 p-r-15 m-b-10 m-l-0 m-r-0">
<div class="col-sm-9 p-l-0 p-r-0">
<h3>{{$ctrl.title}}</h3>
</div>
<div class="col-sm-3 text-right">

2
client/app/components/settings-screen.html
View File

@ -2,7 +2,7 @@
<page-header title="Settings">
</page-header>
<div class="bg-white p-5">
<div class="bg-white tiled p-5">
<ul class="tab-nav">
<li ng-class="{'active': dsPage }" ng-if="showDsLink"><a href="data_sources">Data Sources</a></li>
<li ng-class="{'active': groupsPage }" ng-if="showGroupsLink"><a href="groups">Groups</a></li>

9
client/app/pages/alert/alert.html
View File

@ -1,11 +1,12 @@
<page-header title='{{$ctrl.alert.name || $ctrl.getDefaultName() || "New Alert" }}'>
</page-header>
<div class="container">
<page-header title='{{$ctrl.alert.name || $ctrl.getDefaultName() || "New Alert" }}'>
</page-header>
<email-settings-warning function="'alert emails'"></email-settings-warning>
<div class="container">
<div class="row bg-white p-10">
<div class="row bg-white tiled p-10">
<div class="col-md-8">
<form name="alertForm" class="form">
<div class="form-group">

2
client/app/pages/alerts-list/alerts-list.html
View File

@ -2,7 +2,7 @@
<page-header title="Alerts">
</page-header>
<div class="bg-white">
<div class="bg-white tiled">
<table class="table table-condensed table-hover">
<thead>
<tr>

66
client/app/pages/dashboards/dashboard-list.html
View File

@ -1,37 +1,41 @@
<div class='container'>
<page-header title="Dashboards"></page-header>
<div class="col-lg-3">
<input type='text' class='form-control' placeholder="Search Dashboards..."
ng-change="$ctrl.update()" ng-model="$ctrl.searchText" autofocus/>
<div class='list-group m-t-20 tags-list'>
<a ng-repeat='tag in $ctrl.allTags' ng-class='{"active": $ctrl.tagIsSelected(tag)}'
class='list-group-item' ng-click='$ctrl.toggleTag($event, tag)'>
{{ tag }}
</a>
<div class="row">
<div class="col-lg-3">
<input type='text' class='form-control' placeholder="Search Dashboards..."
ng-change="$ctrl.update()" ng-model="$ctrl.searchText" autofocus/>
<div class='list-group m-t-20 tags-list'>
<a ng-repeat='tag in $ctrl.allTags' ng-class='{"active": $ctrl.tagIsSelected(tag)}'
class='list-group-item' ng-click='$ctrl.toggleTag($event, tag)'>
{{ tag }}
</a>
</div>
</div>
</div>
<div class="col-lg-9">
<div class="bg-white">
<table class="table table-condensed table-hover">
<thead>
<tr>
<th>Name</th>
<th>Created At</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="dashboard in $ctrl.paginator.getPageRows()">
<td>
<a href="dashboard/{{ dashboard.slug }}">
<span class="label label-primary m-2" ng-bind="tag" ng-repeat="tag in dashboard.tags"></span> {{ dashboard.untagged_name }}
<span class="label label-default" ng-if="dashboard.is_draft">Unpublished</span>
</a>
</td>
<td>{{ dashboard.created_at | dateTime }}</td>
</tr>
</tbody>
</table>
<paginator paginator="$ctrl.paginator"></paginator>
<div class="col-lg-9">
<div class="bg-white tiled">
<table class="table table-condensed table-hover">
<thead>
<tr>
<th>Name</th>
<th>Created At</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="dashboard in $ctrl.paginator.getPageRows()">
<td>
<a href="dashboard/{{ dashboard.slug }}">
<span class="label label-primary m-2" ng-bind="tag" ng-repeat="tag in dashboard.tags"></span> {{ dashboard.untagged_name }}
<span class="label label-default" ng-if="dashboard.is_draft">Unpublished</span>
</a>
</td>
<td>{{ dashboard.created_at | dateTime }}</td>
</tr>
</tbody>
</table>
<paginator paginator="$ctrl.paginator"></paginator>
</div>
</div>
</div>
</div>

6
client/app/pages/dashboards/dashboard.html
View File

@ -1,13 +1,13 @@
<div class="container">
<div class="row p-10 p-l-15 p-r-15">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-7 dashboard__header">
<div class="row bg-white tiled p-10 p-l-15 p-r-15 m-b-10 m-l-0 m-r-0">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-7 dashboard__header p-l-0">
<h3>{{$ctrl.dashboard.name}}
<span class="label label-default" ng-if="$ctrl.dashboard.is_draft && !$ctrl.dashboard.is_archived">Unpublished</span>
<span class="label label-warning" ng-if="$ctrl.dashboard.is_archived" uib-popover="This dashboard is archived and and won't appear in the dashboards list or search results." popover-placement="right" popover-trigger="'mouseenter'">Archived</span>
</h3>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-5 text-right dashboard__control">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-5 text-right dashboard__control p-r-0">
<span ng-if="!$ctrl.dashboard.is_archived && !public" class="hidden-print">
<div class="btn-group">

2
client/app/pages/queries-list/queries-list.html
View File

@ -2,7 +2,7 @@
<page-header title="Queries"></page-header>
<tab-nav tabs="$ctrl.tabs"></tab-nav>
<div class="bg-white">
<div class="bg-white tiled">
<table class="table table-condensed table-hover">
<thead>
<tr>

30
client/app/pages/queries/query.html
View File

@ -17,8 +17,8 @@
<alert-unsaved-changes ng-if="canEdit" is-dirty="isDirty"></alert-unsaved-changes>
<div class="row p-10">
<div class="col-sm-9">
<div class="row bg-white tiled p-10 p-l-15 p-r-15 m-b-10 m-l-0 m-r-0 page-header--query">
<div class="col-sm-9 p-l-0">
<h3>
<edit-in-place editable="canEdit" done="saveName" ignore-blanks="true" value="query.name"></edit-in-place>
<span class="label label-default" ng-if="query.is_draft && !query.is_archived">Unpublished</span>
@ -48,7 +48,7 @@
<strong>{{query.last_modified_by.name}}</strong>
</li>
<li>
<span class="zmdi zmdi-time"></span>
<i class="zmdi zmdi-time-restore"></i>
<span class="text-muted">Updated at </span>
<strong>
<rd-time-ago value="query.updated_at"></rd-time-ago>
@ -64,23 +64,21 @@
</ul>
</p>
</div>
<div class="col-sm-3 text-right">
<h3>
<span ng-show="query.id && canViewSource">
<a ng-show="!sourceMode"
ng-href="{{query.getUrl(true, selectedTab)}}" class="btn btn-default">Show Source
</a>
<a ng-show="sourceMode"
ng-href="{{query.getUrl(false, selectedTab)}}" class="btn btn-default">Hide Source
</a>
</span>
</h3>
<div class="col-sm-3 text-right p-r-0">
<span ng-show="query.id && canViewSource">
<a ng-show="!sourceMode"
ng-href="{{query.getUrl(true, selectedTab)}}" class="btn btn-default">Show Source
</a>
<a ng-show="sourceMode"
ng-href="{{query.getUrl(false, selectedTab)}}" class="btn btn-default">Hide Source
</a>
</span>
</div>
</div>
<!-- editor -->
<div class="container">
<div class="row bg-white p-b-5" ng-if="sourceMode" resizable r-directions="['bottom']" r-height="300" style="min-height:100px;">
<div class="row bg-white tiled p-b-5" ng-if="sourceMode" resizable r-directions="['bottom']" r-height="300" style="min-height:100px;">
<schema-browser class="col-md-3 hidden-sm hidden-xs schema-container"
schema="schema"
on-refresh="refreshSchema()"
@ -191,7 +189,7 @@
</li>
<li>
<!-- last update -->
<span class="zmdi zmdi-time"></span>
<i class="zmdi zmdi-time-restore"></i>
<span class="text-muted">Last update </span>
<strong>
<rd-time-ago value="queryResult.query_result.retrieved_at"></rd-time-ago>