ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-03 20:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1133 from charbelrami/markup

Browse Source 
[Frontend] Tweak markup
This commit is contained in:
Andrew Henry 2016-09-07 13:16:04 -07:00 committed by GitHub
commit 06d229ea99
4 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.html
View File

@ -19,16 +19,15 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<!DOCTYPE html> <!doctype html>
<html> <html lang="en">
<head lang="en"> <head>
<meta charset="UTF-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title></title> <title></title>
<script type="text/javascript" <script src="bower_components/requirejs/require.js">
src="bower_components/requirejs/require.js">
</script> </script>
<script type="text/javascript"> <script>
require(['main'], function (mct) { require(['main'], function (mct) {
require([ require([
'./example/imagery/bundle', './example/imagery/bundle',
@ -39,10 +38,10 @@
</script> </script>
<link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css"> <link rel="stylesheet" href="platform/commonUI/general/res/css/startup-base.css">
<link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css"> <link rel="stylesheet" href="platform/commonUI/general/res/css/openmct.css">
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96"> <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="platform/commonUI/general/res/images/favicons/favicon-16x16.png" sizes="16x16">
<link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico"> <link rel="shortcut icon" href="platform/commonUI/general/res/images/favicons/favicon.ico">
</head> </head>
<body class="user-environ"> <body class="user-environ">
<div class="l-splash-holder s-splash-holder"> <div class="l-splash-holder s-splash-holder">

8
platform/forms/res/templates/controls/color.html
View File

@ -36,18 +36,18 @@
ng-controller="ColorController as colors" ng-controller="ColorController as colors"
ng-show="toggle.isActive()"> ng-show="toggle.isActive()">
<div <div
class="l-palette-row l-option-row" class="l-palette-row l-option-row"
ng-if="!structure.mandatory"> ng-if="!structure.mandatory">
<div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}" <div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
ng-click="ngModel[field] = 'transparent'"> ng-click="ngModel[field] = 'transparent'">
</div> </div>
<span class="l-palette-item-label">None</span> <span class="l-palette-item-label">None</span>
</div> </div>
<div <div
class="l-palette-row" class="l-palette-row"
ng-repeat="group in colors.groups()"> ng-repeat="group in colors.groups()">
<div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}" <div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}"
ng-repeat="color in group" ng-repeat="color in group"
ng-style="{ background: color }" ng-style="{ background: color }"
ng-click="ngModel[field] = color"> ng-click="ngModel[field] = color">
</div> </div>

26
platform/forms/res/templates/controls/composite.html
View File

@ -21,18 +21,18 @@
--> -->
<span ng-controller="CompositeController as compositeCtrl"> <span ng-controller="CompositeController as compositeCtrl">
<ng-form name="mctFormItem" ng-repeat="item in structure.items"> <ng-form name="mctFormItem" ng-repeat="item in structure.items">
<div class="l-composite-control l-{{item.control}} {{item.cssclass}}"> <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
<mct-control key="item.control" <mct-control key="item.control"
ng-model="ngModel[field]" ng-model="ngModel[field]"
ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])" ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
ng-pattern="ngPattern" ng-pattern="ngPattern"
options="item.options" options="item.options"
structure="row" structure="row"
field="$index"> field="$index">
</mct-control> </mct-control>
<span class="composite-control-label"> <span class="composite-control-label">
{{item.name}} {{item.name}}
</span> </span>
</div> </div>
</ng-form> </ng-form>
</span> </span>

52
platform/forms/res/templates/toolbar.html
View File

@ -20,31 +20,31 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<form novalidate> <form novalidate>
<div class="tool-bar btn-bar contents abs"> <div class="tool-bar btn-bar contents abs">
<span ng-repeat="section in structure.sections" <span ng-repeat="section in structure.sections"
class="l-control-group" class="l-control-group"
ng-if="!section.hidden" ng-if="!section.hidden"
title="{{section.description}}"> title="{{section.description}}">
<ng-form ng-repeat="item in section.items" <ng-form ng-repeat="item in section.items"
ng-class="{ 'input-labeled': item.name }" ng-class="{ 'input-labeled': item.name }"
ng-hide="item.hidden" ng-hide="item.hidden"
class="inline" class="inline"
title="{{item.description}}" title="{{item.description}}"
name="mctFormInner"> name="mctFormInner">
<label ng-if="item.name"> <label ng-if="item.name">
{{item.name}}: {{item.name}}:
</label> </label>
<mct-control key="item.control" <mct-control key="item.control"
ng-class="{ disabled: item.disabled }" ng-class="{ disabled: item.disabled }"
ng-model="ngModel" ng-model="ngModel"
ng-required="item.required" ng-required="item.required"
ng-pattern="getRegExp(item.pattern)" ng-pattern="getRegExp(item.pattern)"
options="item.options" options="item.options"
structure="item" structure="item"
field="item.key"> field="item.key">
</mct-control> </mct-control>
</ng-form> </ng-form>
</span> </span>
</div> </div>
</form> </form>