Refactor contact editor form element templates markup and style

This commit is contained in:
iRouge
2015-01-28 03:24:53 -05:00
committed by Francis Lachapelle
parent 750a41f19a
commit 56607a1baf
11 changed files with 260 additions and 202 deletions
@@ -108,28 +108,33 @@
</div>
<!-- categories -->
<div class="section">
<!-- if there's some categories, here they are (this is sort of a template) -->
<div class="attr" data-ng-repeat="category in card.categories">
<div class="action">
<span class="button alert icon" data-ng-click="card.$delete('categories', $index)">
<i class="icon-minus"><!-- remove --></i>
</span>
</div>
<div class="key">
<label class="right inline">
<var:string label:value="Category" />
</label>
</div>
<div class="value">
<md-input-container>
<fieldset class="bgroup" layout="row">
<b class="md-icon-remove-circle md-flex" data-ng-click="card.$delete('categories', $index)">
<!-- remove --></b>
<!--<div class="key">-->
<label class="md-flex">
<var:string label:value="Category" />
</label>
</fieldset>
<!--</div>--><!--<div class="value">-->
<input type="text" label:placeholder="category" data-ng-model="category.value" data-sg-focus-on="category_{{$index}}" data-typeahead="cat for cat in card.allCategories | filter:$viewValue" />
</div>
</md-input-container>
<!--</div>-->
</div>
<!-- New category button-group -->
<div class="attr">
<div class="value single">
<!--<div class="value single">-->
<span class="button secondary outline tiny" data-ng-click="addCategory()">
<i class="icon-plus"><!-- new --></i>
<var:string label:value="New Category" />
</span>
</div>
<!--</div>-->
</div>
</div>
<!-- emails -->
@@ -67,7 +67,7 @@
Templates script tag wrappers goes next
-->
<!-- fixme : consitently prefix attributes with or without data prefix-->
<!-- fixme : consistently prefix attributes with or without data prefix-->
<main class="view md-layout-fill" data-ui-view="addressbooks" layout="row"><!-- addressbooks list --></main>
<!-- TEMPLATE SCRIPT WRAPPER -->
@@ -188,8 +188,8 @@
</md-content>
</md-sidenav>
<main layout = "column" layout-fill = "layout-fill">
<md-toolbar layout="row" layout-align="space-between start" class="md-tall">
<section layout="column" class="md-layout-fill">
<md-toolbar layout="row" layout-align="space-between start" class="md-tall">
<div class="md-toolbar-tools" ng-controller="toggleCtrl">
<span flex="flex">
<md-button ng-click="toggleLeft()" class="md-primary" hide-gt-md="hide-gt-md">
@@ -204,51 +204,45 @@
</span>
</div>
</md-toolbar>
<md-content layout="row" class="md-flex">
<md-content md-scroll-y = "md-scroll-y" class = "md-flex" style = "min-width: 300px;" id = "contactsList">
<!-- Search field & special results
<input type="text" placeholder="Search" data-ng-model="search.filter" data-ng-keyup="doSearch($event)" />
<div data-ng-switch="search.status">
<div data-ng-switch-when="min-char" class="alert-bg">
<i class="icon-warning"></i><var:string label:value="Please enter at least three characters"/>
</div>
<div data-ng-switch-when="no-result" class="alert-bg">
<i class="icon-ion-search"></i><var:string label:value="No matching card"/>
</div>
<div data-ng-switch-when="remote-addressbook" data-ng-show="addressbook.cards.length == 0" class="alert-bg">
<i class="icon-ion-search"></i><var:string label:value="Initiate a search"/>
</div>
</div>
-->
<!--dirty fix for vs-repeat-->
<style>
.vs-repeat-repeated-element {
width: 100%;
}
</style>
<md-list data-vs-repeat = "72"
data-vs-scroll-parent = "#contactsList">
<md-item ng-repeat = "currentCard in addressbook.cards track by currentCard.id"
ng-class = "{_selected: card.id == currentCard.id}">
<md-item-content>
<div class = "md-tile-left">
<!--avatar-->
<!-- currentCard.tag = vcard || vlist -->
</div>
<div class = "sg-tile-content">
<a data-ui-sref = "addressbook.card.view({addressbookId: addressbook.id, cardId: currentCard.id})">
<div class = "name" ng-bind-html = "currentCard.$fullname()"><!-- cn --></div>
<div class = "subject">{{currentCard.$preferredEmail()}}</div>
</a>
</div>
</md-item-content>
<md-divider md-inset = "true" ng-if = "!$last"><!--divider--></md-divider>
</md-item>
</md-list>
</md-content>
<md-content class = "md-padding md-flex" data-ui-view = "card"><!-- card view --></md-content>
<md-content layout="row" class="md-flex">
<md-content md-scroll-y="md-scroll-y" class="md-flex" style="min-width: 300px;" id="contactsList">
<!-- Search field & special results
<input type="text" placeholder="Search" data-ng-model="search.filter" data-ng-keyup="doSearch($event)" />
<div data-ng-switch="search.status">
<div data-ng-switch-when="min-char" class="alert-bg">
<i class="icon-warning"></i><var:string label:value="Please enter at least three characters"/>
</div>
<div data-ng-switch-when="no-result" class="alert-bg">
<i class="icon-ion-search"></i><var:string label:value="No matching card"/>
</div>
<div data-ng-switch-when="remote-addressbook" data-ng-show="addressbook.cards.length == 0" class="alert-bg">
<i class="icon-ion-search"></i><var:string label:value="Initiate a search"/>
</div>
</div>
--><!--dirty fix for vs-repeat-->
<style>
.vs-repeat-repeated-element { width: 100%; }
</style>
<md-list data-vs-repeat="72" data-vs-scroll-parent="#contactsList">
<md-item ng-repeat="currentCard in addressbook.cards track by currentCard.id" ng-class="{_selected: card.id == currentCard.id}">
<md-item-content>
<div class="md-tile-left">
<!--avatar--><!-- currentCard.tag = vcard || vlist -->
</div>
<div class="sg-tile-content">
<a data-ui-sref="addressbook.card.view({addressbookId: addressbook.id, cardId: currentCard.id})">
<div class="name" ng-bind-html="currentCard.$fullname()"><!-- cn --></div>
<div class="subject">{{currentCard.$preferredEmail()}}</div>
</a>
</div>
</md-item-content>
<md-divider md-inset="true" ng-if="!$last"><!--divider--></md-divider>
</md-item>
</md-list>
</md-content>
</main>
<md-content class="md-padding md-flex" data-ui-view="card"><!-- card view --></md-content>
</md-content>
</section>
</script>
<!-- modal for addressbook sharing options -->
@@ -5,98 +5,106 @@
xmlns:const = "http://www.skyrix.com/od/constant"
xmlns:label = "OGo:label"
>
<div class="viewer">
<div class="header">
<h1 data-ng-bind-html="card.$fullname()"><!-- fullname --></h1>
<h6>{{card.$description()}}
<span class="label radius" data-ng-repeat="category in card.categories">{{category.value}}</span>
</h6>
</div>
<div class="buttonsToolbar">
<span data-ng-show="addressbook.isEditable">
<a class="button tiny radius" data-ui-sref="addressbook.card.editor({addressbookId: addressbook.id, cardId: card.id})">
<i class="icon-pencil"><!-- edit --></i>
</a>
<span class="button tiny radius alert" data-ng-click="confirmDelete(card)">
<i class="icon-trash"><!-- delete --></i>
<md-card class="viewer">
<md-card-content>
<header>
<h1 data-ng-bind-html="card.$fullname()"><!-- fullname --></h1>
<h6>{{card.$description()}}
<span class="label radius" data-ng-repeat="category in card.categories">{{category.value}}</span>
</h6>
</header>
<div class="buttonsToolbar">
<span data-ng-show="addressbook.isEditable">
<a class="button tiny radius" data-ui-sref="addressbook.card.editor({addressbookId: addressbook.id, cardId: card.id})">
<i class="icon-pencil"><!-- edit --></i>
</a>
<span class="button tiny radius alert" data-ng-click="confirmDelete(card)">
<i class="icon-trash"><!-- delete --></i>
</span>
</span>
</span>
</div>
<div class="attr" data-ng-show="card.birthday">
<div class="key">
<label class="right">
<var:string label:value="Birthday" />
</label>
</div>
<div class="value">
<span>{{card.$birthday() | date}}</span>
</div>
</div>
<div class="section" data-ng-repeat="ref in card.refs track by ref.reference">
<!-- list members -->
<div class="attr">
<div class="value single">
<a data-ui-sref="addressbook.card.view({addressbookId: addressbook.id, cardId: ref.reference})">{{ref.$fullname()}}</a>
<div data-ng-show="ref.email">
<a href="mailto:{{ref.email}}">
<i class="icon-ion-ios7-email-outline"><!-- email --></i>
{{ref.email}}
</a>
<section class="content" data-ui-sref="addressbook.card.editor({addressbookId: addressbook.id, cardId: card.id})">
<div class="attr" data-ng-show="card.birthday">
<div class="key">
<label class="right">
<var:string label:value="Birthday" />
</label>
</div>
<div class="value">
<span>{{card.$birthday() | date}}</span>
</div>
</div>
</div>
</div>
<div class="section" data-ng-show="card.emails.length > 0">
<div class="attr" data-ng-repeat="email in card.emails">
<div class="key">
<label class="right"><var:entity const:name="nbsp" />{{email.type}}
</label>
<div class="section" data-ng-repeat="ref in card.refs track by ref.reference">
<!-- list members -->
<div class="attr">
<div class="value single">
<a data-ui-sref="addressbook.card.view({addressbookId: addressbook.id, cardId: ref.reference})">{{ref.$fullname()}}</a>
<div data-ng-show="ref.email">
<a data-ui-sref="mailto:{{ref.email}}" ng-class="ng-scope">
<i class="icon-ion-ios7-email-outline"><!-- email --></i>
{{ref.email}}
</a>
</div>
</div>
</div>
</div>
<div class="value">
<a href="mailto:{{email.value}}">{{email.value}}</a>
<div class="section" data-ng-show="card.emails.length > 0">
<div class="attr" data-ng-repeat="email in card.emails">
<div class="key">
<label class="right"><var:entity const:name="nbsp" />{{email.type}}
</label>
</div>
<div class="value">
<a href="mailto:{{email.value}}">{{email.value}}</a>
</div>
</div>
</div>
</div>
</div>
<div class="section" data-ng-show="card.phones.length > 0">
<div class="attr" data-ng-repeat="phone in card.phones">
<div class="key">
<label class="right">{{phone.type}}</label>
<div class="section" data-ng-show="card.phones.length > 0">
<div class="attr" data-ng-repeat="phone in card.phones">
<div class="key">
<label class="right">{{phone.type}}</label>
</div>
<div class="value">
<a href="tel:{{phone.value}}">{{phone.value}}</a>
</div>
</div>
</div>
<div class="value">
<a href="tel:{{phone.value}}">{{phone.value}}</a>
<div class="section" data-ng-show="card.urls">
<div class="attr" data-ng-repeat="url in card.urls">
<div class="key">
<label class="right"><var:entity const:name="nbsp" />{{url.type}}
</label>
</div>
<div class="value">
<a href="#" data-ng-href="{{url.value}}">{{url.value}}</a>
</div>
</div>
</div>
</div>
</div>
<div class="section" data-ng-show="card.urls">
<div class="attr" data-ng-repeat="url in card.urls">
<div class="key">
<label class="right"><var:entity const:name="nbsp" />{{url.type}}
</label>
<div class="section" data-ng-show="card.addresses">
<div class="attr" data-ng-repeat="address in card.addresses">
<div class="key">
<label class="right">{{address.type}}</label>
</div>
<div class="value">
<div data-sg-address="address"><!-- address --></div>
</div>
</div>
</div>
<div class="value">
<a href="#" data-ng-href="{{url.value}}">{{url.value}}</a>
<div class="attr" data-ng-show="card.note">
<div class="key">
<label class="right">
<var:string label:value="Note" />
</label>
</div>
<div class="value">
<div data-ng-bind-html="card.note"><!-- note --></div>
</div>
</div>
</div>
</div>
<div class="section" data-ng-show="card.addresses">
<div class="attr" data-ng-repeat="address in card.addresses">
<div class="key">
<label class="right">{{address.type}}</label>
</div>
<div class="value">
<div data-sg-address="address"><!-- address --></div>
</div>
</div>
</div>
<div class="attr" data-ng-show="card.note">
<div class="key">
<label class="right">
<var:string label:value="Note" />
</label>
</div>
<div class="value">
<div data-ng-bind-html="card.note"><!-- note --></div>
</div>
</div>
</div>
</section>
</md-card-content>
</md-card>
</container>
@@ -35,6 +35,6 @@
</md-list>
</md-content>
<div layout = "column" flex = "60" data-ui-view = "message"><!-- message view --></div>
<div layout="column" flex="60" data-ui-view="message"><!-- message view --></div>
</container>
+68 -52
View File
@@ -2383,6 +2383,9 @@ md-tab > .md-ripple-container .md-ripple {
[layout="column"] > [flex-gt-lg="66"], [layout="column"] > [flex-gt-lg="67"] {
flex: 0 0 66.66%;
max-height: 66.66%; } }
.md-flex {
flex: 1 1 auto; }
@font-face {
font-family: 'Material Design Iconic Font';
src: url("../bower_components/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot?v=1.0.1");
@@ -4882,58 +4885,6 @@ md-toolbar {
.md-toolbar-tools .md-button {
font-size: 14px; }
md-toolbar {
display: flex;
flex-direction: column;
position: relative;
z-index: 2;
font-size: 1.3em;
min-height: 64px;
width: 100%; }
md-toolbar.md-tall {
height: 128px;
min-height: 128px;
max-height: 128px; }
md-toolbar.md-medium-tall {
height: 88px;
min-height: 88px;
max-height: 88px; }
md-toolbar.md-medium-tall .md-toolbar-tools {
height: 48px;
min-height: 48px;
max-height: 48px; }
md-toolbar.md-toolbar-small {
min-height: 48px; }
md-toolbar .md-indent {
margin-left: 64px; }
.md-toolbar-tools {
display: flex;
align-items: center;
flex-direction: row;
width: 100%;
height: 64px;
min-height: 100%;
max-height: 64px;
font-size: inherit;
font-weight: normal;
padding: 0 16px;
margin: 0; }
.md-toolbar-tools > * {
font-size: inherit; }
.md-toolbar-tools h2, .md-toolbar-tools h3 {
font-weight: normal; }
.md-toolbar-tools a {
color: inherit;
text-decoration: none; }
.md-toolbar-tools .fill-height {
display: flex;
align-items: center; }
.md-toolbar-tools .md-tools {
margin-left: auto; }
.md-toolbar-tools .md-button {
font-size: 14px; }
md-toolbar.sg-bottombar {
@extends md-toolbar;
background-color: #121212;
@@ -4954,6 +4905,71 @@ sg-bottombar.md-THEME_NAME-theme {
background-color: '{{warn-color}}';
color: '{{warn-contrast}}'; }
md-input-container {
display: flex;
position: relative;
flex-direction: column;
padding: 2px;
/*
* The .md-input class is added to the input/textarea
*/ }
md-input-container textarea,
md-input-container input[type="text"],
md-input-container input[type="password"],
md-input-container input[type="datetime"],
md-input-container input[type="datetime-local"],
md-input-container input[type="date"],
md-input-container input[type="month"],
md-input-container input[type="time"],
md-input-container input[type="week"],
md-input-container input[type="number"],
md-input-container input[type="email"],
md-input-container input[type="url"],
md-input-container input[type="search"],
md-input-container input[type="tel"],
md-input-container input[type="color"] {
/* remove default appearance from all input/textarea */
-moz-appearance: none;
-webkit-appearance: none; }
md-input-container textarea {
resize: none;
overflow: hidden; }
md-input-container label {
order: 1;
pointer-events: none;
-webkit-font-smoothing: antialiased;
z-index: 1;
transform: translate3d(0, 24px, 0) scale(1);
transform-origin: left top;
transition: all cubic-bezier(0.25, 0.8, 0.25, 1) 0.2s; }
md-input-container .md-input {
flex: 1;
order: 2;
display: block;
background: none;
padding-top: 2px;
padding-bottom: 1px;
border-width: 0 0 1px 0;
line-height: 26px;
-ms-flex-preferred-size: 26px; }
md-input-container .md-input:focus {
outline: none; }
md-input-container.md-input-focused label, md-input-container.md-input-has-value label {
transform: translate3d(0, 4px, 0) scale(0.75); }
md-input-container.md-input-focused .md-input {
padding-bottom: 0px;
border-width: 0 0 2px 0; }
md-input-container .md-input[disabled] {
background-position: 0 bottom;
background-size: 3px 1px;
background-repeat: repeat-x; }
md-input-container .bgroup {
display: block; }
.bgroup b {
left-margin: -1.25em; }
/**
*
* @filename _base_styles.scss
File diff suppressed because one or more lines are too long
+25
View File
@@ -0,0 +1,25 @@
./ContactsUI/UIxContactEditorTemplate.wox:101: parser error : Opening and ending tag mismatch: md-input-container line 97 and div
</div>
^
./ContactsUI/UIxContactEditorTemplate.wox:105: parser error : Opening and ending tag mismatch: div line 102 and md-input-container
</md-input-container>
^
./ContactsUI/UIxContactEditorTemplate.wox:363: parser error : Opening and ending tag mismatch: div line 9 and md-content
</md-content>
^
./ContactsUI/UIxContactEditorTemplate.wox:365: parser error : Opening and ending tag mismatch: md-content line 8 and container
</container>
^
./ContactsUI/UIxContactEditorTemplate.wox:366: parser error : Premature end of data in tag container line 2
@@ -91,3 +91,9 @@ md-input-container {
background-repeat: repeat-x;
}
}
md-input-container .bgroup {
display: block;
}
.bgroup b {
left-margin: -1.25em;
}
@@ -13,3 +13,6 @@ layout-fill,
flex, flex-sm, flex-gt-sm, flex-md, flex-gt-md, flex-lg, flex-gt-lg, hide, hide-sm, hide-gt-sm, hide-md, hide-gt-md, hide-lg, hide-gt-lg, show, show-sm, show-gt-sm, show-md, show-gt-md, show-lg, show-gt-lg;
@include attributesToClasses($selectors);
.md-flex {
flex: 1 1 auto;
}
+1 -1
View File
@@ -24,7 +24,7 @@
@each $selector in $selectors {
.md-#{$selector} {
// no syntax error here
@extend [#{$selector}] !optional
@extend #{'['$selector']'} !optional
}
}
}
+2 -1
View File
@@ -49,8 +49,9 @@
/* Angular-material components local overrides */
@import 'components/list/list.scss';
@import 'components/divider/divider.scss';
@import 'components/toolbar/toolbar.scss';
@import 'components/bottombar/bottombar.scss';
@import 'components/input/input.scss';
// core styles - need to be after components till settings are correctly implemented
// ------------------------------------------------------------------------------