-
Notifications
You must be signed in to change notification settings - Fork 506
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Summary: * abstracts `card` for reusability * reorganizes directories * styles custom form wizard * config * settings * Fixes T351 Test Plan: * check styles and responsiveness for custom form wizard Reviewers: rjmackay, shadowhand Reviewed By: shadowhand Subscribers: dkobia Maniphest Tasks: T351 Differential Revision: https://phabricator.ushahidi.com/D179
- Loading branch information
Seth Hall
committed
Jun 12, 2014
1 parent
b263613
commit 80ee4ce
Showing
23 changed files
with
408 additions
and
334 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 12 additions & 12 deletions
24
modules/UshahidiUI/media/js/app/templates/settings/DataProviderListItem.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| <div class="data-provider-card {{#unless enabled}}disabled{{/unless}}"> | ||
| <div class="data-provider-hero-unit"> | ||
| <h6 class="data-provider-header">{{ name }}</h6> | ||
| <div class="data-provider-icon"> | ||
| <div class="card {{#unless enabled}}disabled{{/unless}}"> | ||
| <div class="card-hero-unit"> | ||
| <h6 class="card-header">{{ name }}</h6> | ||
| <div class="card-icon"> | ||
| <i class="sms-icon"></i> | ||
| </div> <!-- end .data-provider-icon --> | ||
| </div> <!-- end .data-provider-hero-unit --> | ||
| </div> <!-- end .card-icon --> | ||
| </div> <!-- end .card-hero-unit --> | ||
|
|
||
| <div class="data-provider-body"> | ||
| <div class="data-provider-status-wrapper"> | ||
| <a class="data-provider-status js-provider-status">{{#if enabled}}Disable{{else}}Enable{{/if}}</a> | ||
| <a class="data-provider-configure" href="#messages/settings/{{id}}"><i class="fa fa-cogs"></i> Configure</a> | ||
| <div class="card-body"> | ||
| <div class="card-status-wrapper"> | ||
| <a class="card-status js-provider-status">{{#if enabled}}Disable{{else}}Enable{{/if}}</a> | ||
| <a class="card-configure" href="#messages/settings/{{id}}"><i class="fa fa-cogs"></i> Configure</a> | ||
| </div> | ||
| </div> <!-- end .data-provider-body --> | ||
| </div> <!-- end .card-body --> | ||
|
|
||
| </div> <!-- end .data-provider-card --> | ||
| </div> <!-- end .card-card --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 14 additions & 3 deletions
17
modules/UshahidiUI/media/js/app/templates/settings/FormListItem.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,14 @@ | ||
| <article> | ||
| <a href="#settings/forms/{{id}}">{{name}}</a> <small><tt>type:</tt> {{type}}</small> | ||
| </article> | ||
| <div class="card {{#unless enabled}}disabled{{/unless}}"> | ||
|
|
||
| <div class="card-hero-unit--form-wizard"> | ||
| <h6 class="card-header--form-wizard">{{name}}</h6> | ||
| </div> <!-- end .card-hero-unit-form-wizard --> | ||
|
|
||
| <div class="card-body"> | ||
| <div class="card-status-wrapper"> | ||
| <a href="#settings/forms/{{id}}" class="card-configure">Edit</a> | ||
| <small class="form-type"><tt>type :</tt> {{type}}</small> | ||
| </div> | ||
| </div> <!-- end .card-body --> | ||
|
|
||
| </div> <!-- end .card --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
modules/UshahidiUI/media/scss/modules/form-wizard/_form-wizard.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| @import "modules/card"; | ||
| @import "modules/edit"; |
34 changes: 34 additions & 0 deletions
34
modules/UshahidiUI/media/scss/modules/form-wizard/modules/_card.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /*------------------------------------*\ | ||
| CONTENTS | ||
| \*------------------------------------*/ | ||
| /** | ||
| * FORM WIZARD...............form wizard create/edit/config | ||
| * FORM WIZARD SETTINGS...............form wizard settings | ||
| */ | ||
|
|
||
|
|
||
|
|
||
|
|
||
| /*------------------------------------*\ | ||
| $FORM WIZARD | ||
| \*------------------------------------*/ | ||
|
|
||
| .card-list--form-wizard { | ||
| @extend .card-list; | ||
| } | ||
|
|
||
| .card-hero-unit--form-wizard { | ||
| @extend %card-hero-unit; | ||
| background-color: $secondary-color; | ||
| padding: 20px 0; | ||
| } | ||
|
|
||
| .card-header--form-wizard { | ||
| @extend %card-header; | ||
| color: $body-font-color; | ||
| } | ||
|
|
||
| .form-type { | ||
| display: block; | ||
| text-align: center; | ||
| } |
Oops, something went wrong.