Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #210 and some other misc styling improvements
  • Loading branch information
gashcrumb committed Mar 26, 2013
1 parent 970cbd3 commit e577db5
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 43 deletions.
23 changes: 14 additions & 9 deletions hawtio-web/src/main/webapp/app/source/html/index.html
@@ -1,13 +1,18 @@
<div ng-controller="Source.IndexController">
<ul class="nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : link.active}'>
<a ng-click="setFileName(link)">
{{link.name}}
</a>
</li>
</ul>

<div class="row-fluid">
<div class="logbar">
<div class="wiki logbar-container">
<ul class="nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : link.active}'>
<a ng-click="setFileName(link)">
{{link.name}}
</a>
</li>
</ul>
</div>
</div>

<div class="wiki-fixed row-fluid">
<div class="control-group inline-block">
<input class="search-query input-xxlarge" type="text" ng-model="searchText" placeholder="Filter files...">
</div>
Expand All @@ -18,7 +23,7 @@
</table>
</div>

<div class="span12" ng-show="loadingMessage">
<div class="wiki-fixed row-fluid" ng-show="loadingMessage">
<div class="alert alert-info">
<i class="icon-spinner icon-spin icon-2x"></i>
<span ng-bind-html-unsafe="loadingMessage"></span>
Expand Down
31 changes: 17 additions & 14 deletions hawtio-web/src/main/webapp/app/source/html/source.html
@@ -1,25 +1,28 @@
<div ng-controller="Source.SourceController">
<div class="row-fluid">
<ul class="nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : link.active}'>
<a ng-href="{{link.href}}{{hash}}">
{{link.name}}
</a>
</li>
<li class="pull-right" ng-show="javaDocLink()">
<a target="javadoc" ng-href="{{javaDocLink()}}{{hash}}" title="View the javadocs"
data-placement="bottom">
<i class="icon-file-alt"></i> JavaDoc</a></li>
</ul>

<div class="logbar">
<div class="wiki logbar-container">
<ul class="nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : link.active}'>
<a ng-href="{{link.href}}{{hash}}">
{{link.name}}
</a>
</li>
<li class="pull-right" ng-show="javaDocLink()">
<a target="javadoc" ng-href="{{javaDocLink()}}{{hash}}" title="View the javadocs"
data-placement="bottom">
<i class="icon-file-alt"></i> JavaDoc</a></li>
</ul>
</div>
</div>

<div class="form-horizontal">
<div class="wiki-fixed form-horizontal">
<div class="control-group editor-autoresize">
<textarea id="source" ui-codemirror="codeMirrorOptions" ng-model="source"></textarea>
</div>
</div>

<div class="span12" ng-show="loadingMessage">
<div class="wiki-fixed row-fluid" ng-show="loadingMessage">
<div class="alert alert-info">
<i class="icon-spinner icon-spin icon-2x"></i>
<span ng-bind-html-unsafe="loadingMessage"></span>
Expand Down
48 changes: 28 additions & 20 deletions hawtio-web/src/main/webapp/app/wiki/html/createPage.html
@@ -1,29 +1,37 @@
<div ng-controller="Wiki.EditController">
<div ng-controller="Wiki.NavBarController">
<ul class="connected nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : isActive(link.href)}'>
<a ng-href="{{link.href}}{{hash}}">
{{link.name}}
</a>
</li>
<div class="logbar" ng-controller="Wiki.NavBarController">

<div id="alert-area" class="span6"></div>
<div class="wiki logbar-container">

<button id="cancelButton" ng-click="cancel()"
class="btn pull-right"
title="Discards any updates">
<i class="icon-cloud-download"></i> Cancel
</button>
<ul class="connected nav nav-tabs">
<li ng-repeat="link in breadcrumbs" ng-class='{active : isActive(link.href)}'>
<a ng-href="{{link.href}}{{hash}}">
{{link.name}}
</a>
</li>

<button id="saveButton" ng-disabled="!isValid()" ng-click="create()"
class="btn btn-info pull-right"
title="Creates this page and saves it in the wiki">
<i class="icon-cloud-download"></i> Create
</button>
</ul>
<li class="pull-right">

<a href="" id="cancelButton" ng-click="cancel()"
class="pull-right"
title="Discards any updates">
<i class="icon-remove"></i> Cancel
</a>
</li>

<li class="pull-right">
<a href="" id="saveButton" ng-show="isValid()" ng-click="create()"
class="pull-right"
title="Creates this page and saves it in the wiki">
<i class="icon-file-alt"></i> Create
</a>
</li>

</ul>
</div>
</div>

<div class="form-horizontal">
<div class="wiki-fixed form-horizontal">
<div class="control-group">
<input type="text" ng-model="fileName" placeholder="File name" class="span12"/>
</div>
Expand Down

0 comments on commit e577db5

Please sign in to comment.