Skip to content

Commit 553ada1

Browse files
author
Michiel Vancoillie
committed
Design & title updates
1 parent 236cfc2 commit 553ada1

File tree

11 files changed

+147
-41
lines changed

11 files changed

+147
-41
lines changed

‎app/controllers/tdt/core/HomeController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class HomeController extends \Controller {
1313
public static function handle($uri){
1414
$definitions = \Definition::all();
1515

16-
$view = \View::make('home')->with('title', 'The Datatank')
16+
$view = \View::make('home')->with('title', 'Datasets | The Datatank')
17+
->with('page_title', 'Datasets')
1718
->with('definitions', $definitions);
1819

1920
return \Response::make($view);

‎app/controllers/tdt/core/formatters/HTMLFormatter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ public static function getBody($dataObj){
121121
}
122122

123123
// Render the view
124-
return \View::make($view)->with('title', 'The Datatank')
124+
return \View::make($view)->with('title', 'Dataset: '. $dataObj->definition->collection_uri . "/" . $dataObj->definition->resource_name . ' | The Datatank')
125125
->with('body', $data)
126+
->with('page_title', $dataObj->definition->collection_uri . "/" . $dataObj->definition->resource_name)
126127
->with('definition', $dataObj->definition)
127128
->with('paging', $dataObj->paging)
128129
->with('source_definition', $dataObj->source_definition)

‎app/controllers/tdt/core/ui/DatasetController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function getIndex(){
2424
$definitions = \Definition::all();
2525

2626
return \View::make('ui.datasets.list')
27-
->with('title', 'The Datatank')
27+
->with('title', 'Dataset management | The Datatank')
2828
->with('definitions', $definitions);
2929

3030
return \Response::make($view);
@@ -126,7 +126,7 @@ public function getAdd(){
126126
}
127127

128128
return \View::make('ui.datasets.add')
129-
->with('title', 'The Datatank')
129+
->with('title', 'Add a dataset | The Datatank')
130130
->with('mediatypes', $mediatypes);
131131

132132
return \Response::make($view);
@@ -202,7 +202,7 @@ public function getEdit($id){
202202
}
203203

204204
return \View::make('ui.datasets.edit')
205-
->with('title', 'The Datatank')
205+
->with('title', 'Edit a dataset | The Datatank')
206206
->with('definition', $definition)
207207
->with('mediatype', $mediatype)
208208
->with('parameters_required', $parameters_required)

‎app/controllers/tdt/core/ui/GroupController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function getIndex(){
3737
$error = Flash::get();
3838

3939
return \View::make('ui.groups.list')
40-
->with('title', 'The Datatank')
40+
->with('title', 'Group management | The Datatank')
4141
->with('users', $users)
4242
->with('groups', $groups)
4343
->with('permission_groups', $permission_groups)

‎app/controllers/tdt/core/ui/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getIndex(){
3030
$error = Flash::get();
3131

3232
$view = \View::make('ui.users.list')
33-
->with('title', 'The Datatank')
33+
->with('title', 'User management | The Datatank')
3434
->with('users', $users)
3535
->with('groups', $groups)
3636
->with('error', $error);

‎app/views/home.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
@section('content')
44

55
<div class="col-sm-12">
6-
<h3>All datasets</h3>
7-
<div class="input-group">
8-
<input id='dataset-filter' type="text" class="form-control" placeholder='Search for datasets'>
9-
<span class="input-group-btn">
10-
<button class="btn btn-default" type="button" disabled>Filter</button>
11-
</span>
12-
</div>
13-
14-
<br/>
156

167
@foreach($definitions as $definition)
178

@@ -65,4 +56,13 @@
6556
</div>
6657
</div>
6758

59+
@stop
60+
61+
@section('navigation')
62+
63+
<div class="search pull-right">
64+
<input id='dataset-filter' type="text" placeholder='Search for datasets' spellcheck='false'>
65+
<i class='fa fa-search'></i>
66+
</div>
67+
6868
@stop

‎app/views/layouts/admin.blade.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
<body>
1515
<nav class="navbar navbar-fixed-top">
16-
<a class="navbar-brand" href="{{ URL::to('api/admin') }} ">
16+
<a class="navbar-brand admin" href="{{ URL::to('api/admin') }} ">
1717
<img src='{{ URL::to("img/logo.png") }}' alt='Datatank logo' />
18-
<h1>DataTank &middot; Admin</h1>
18+
<h1>Admin</h1>
1919
</a>
2020

21-
<ul class="nav navbar-nav navbar-right">
21+
<ul class="nav navbar-nav">
2222
@if(tdt\core\auth\Auth::hasAccess('admin.dataset.view'))
2323
<li @if(Request::segment(3) == '' || Request::segment(3) == 'datasets') class='active' @endif>
2424
<a href="{{ URL::to('api/admin/datasets') }}">
@@ -41,6 +41,8 @@
4141
</li>
4242
@endif
4343
</ul>
44+
45+
@yield('navigation')
4446
</nav>
4547

4648
<div class="wrapper">
@@ -53,7 +55,7 @@
5355

5456
<footer>
5557
<div class="col-lg-12">
56-
The DataTank &middot; <a href="//thedatatank.com/" target="_blank">Visit our website</a>
58+
Powered by <a href="//thedatatank.com/" target="_blank">The DataTank</a>
5759
</div>
5860
</footer>
5961
<script type='text/javascript'>

‎app/views/layouts/master.blade.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<meta name="DC.title" content="{{ $title }}"/>
99

10-
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
11-
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
10+
<link href='//fonts.googleapis.com/css?family=Varela+Round|Open+Sans:400,300,600' rel='stylesheet' type='text/css'>
1211
<link rel='stylesheet' href='{{ URL::to("css/main.css") }}' type='text/css'/>
1312
</head>
1413

1514
<body>
1615
<nav class="navbar navbar-fixed-top">
1716
<a class="navbar-brand" href="{{ URL::to('') }} ">
1817
<img src='{{ URL::to("img/logo.png") }}' alt='Datatank logo' />
19-
<h1>&nbsp;</h1>
18+
<h1>@if(!empty($page_title)){{ $page_title }}@endif&nbsp;</h1>
2019
</a>
2120

2221
@yield('navigation')
@@ -32,7 +31,7 @@
3231

3332
<footer>
3433
<div class="col-lg-12">
35-
The DataTank &middot; <a href="//thedatatank.com/" target="_blank">Visit our website</a>
34+
Powered by <a href="//thedatatank.com/" target="_blank">The DataTank</a>
3635
</div>
3736
</footer>
3837
<script src="{{ URL::to("js/script.min.js") }}" type="text/javascript"></script>

‎app/views/ui/datasets/list.blade.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@
66
<div class="col-sm-7">
77
<h3>Manage your data</h3>
88
</div>
9-
<div class='col-sm-4 text-right'>
10-
<div class="input-group"
11-
data-step='2'
12-
data-intro='Start typing here to <strong>search</strong> for a dataset.'
13-
data-position="bottom"
14-
>
15-
<input id='dataset-filter' type="text" class="form-control" placeholder='Search for datasets' />
16-
</div>
17-
</div>
18-
<div class="col-sm-1 text-right">
9+
<div class="col-sm-5 text-right">
1910
<a href='{{ URL::to('api/admin/datasets/add') }}' class='btn btn-primary margin-left'
2011
data-step='1'
2112
data-intro='Add a new dataset to the system.'
@@ -124,4 +115,13 @@
124115
</div>
125116
</div>
126117

118+
@stop
119+
120+
@section('navigation')
121+
122+
<div class="search pull-right">
123+
<input id='dataset-filter' type="text" placeholder='Search for datasets' spellcheck='false'>
124+
<i class='fa fa-search'></i>
125+
</div>
126+
127127
@stop

0 commit comments

Comments
 (0)