You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/16 10:34:11 UTC
[1/4] commiting changes provided by Chanaka Jayasena, STRATOS-359
Updated Branches:
refs/heads/master e72304172 -> d48fa396f
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
index aa1363d..0f7863c 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
@@ -206,6 +206,9 @@ body {
float:left;
margin-right:10px;
}
+i.icons-small-size{
+ font-size: 20px;
+}
.content-starter{
margin-top: 125px;
}
@@ -329,7 +332,70 @@ h4{
height: 55px;
color:#999;
}
-
+/* wizard menu */
+.sub-menu-wizard{
+ padding:0;
+ margin:-7px 0 0;
+}
+.sub-menu-wizard li{
+ list-style: none;
+ float:left;
+ background: #dcdcdc;
+ text-align: center;
+}
+.sub-menu-wizard li.no-background{
+ background: transparent;
+}
+.sub-menu-wizard li a{
+ display:block;
+ padding:5px 10px;
+ height: 55px;
+ text-align: center;
+}
+.sub-menu-wizard li.active a{
+ background: #ffae00;
+ color:#fff;
+}
+.sub-menu-wizard li span{
+ display:block;
+ padding:15px 10px;
+ border-left: solid 1px #f2f5f5;
+ border-right: solid 1px #d1d3d3;
+ height: 55px;
+ color:#999;
+}
+.sub-menu-wizard-pointer {
+ content: '';
+ border-style: solid;
+ border-width: 27px 0 28px 10px;
+ border-color: transparent #dcdcdc;
+ display: block;
+ width: 0;
+ z-index: 1;
+}
+ul li.active-pointer{
+ border-color: transparent #ffae00;
+ background: #ffae00;
+}
+div.wizard-number{
+ display: inline-block;
+ width:20px;
+ padding:2px 5px;
+ background: #595a5a;
+ color:#fff;
+ font-weight: bold;
+ font-size: 12px;
+ border-radius: 11px;
+ -moz-border-radius: 11px;
+ -webkit-border-radius: 11px;
+}
+div.in-active-wizard-item{
+ padding:5px 10px;
+ height: 55px;
+}
+ul.sub-menu-wizard li.active-no-background{
+ background: #dcdcdc;
+}
/* syntax highlight styles */
pre {border:none;background: transparent }
.string { color: green; }
@@ -360,4 +426,52 @@ textarea.jsonEditor{
}
label.required{
font-weight: bold;
+}
+li.dropdown ul.dropdown-menu li{
+ float: none;
+}
+li.dropdown ul.dropdown-menu li a{
+ height: 28px;
+ padding: 3px 20px;
+ text-align: left;
+}
+li.dropdown ul.dropdown-menu li a:hover{
+ background: #3e3f3f;
+}
+li.dropdown ul.dropdown-menu li a i{
+ font-size: 20px;
+}
+.green-check{
+ color: #00b600;
+ font-size:18px;
+}.orange-check{
+ color: #e68d00;
+ font-size:18px;
+}
+.table thead > tr > th{
+ vertical-align: top;
+ background: #9d9f9f;
+ color:#fff;
+}
+.table thead > tr > th div{
+ font-size: 11px;
+ color:#d9d9d9;
+}
+.terms-of-use{
+ padding:10px;
+ background: #f7f7f7;
+ border: solid 1px #d1d1d1;
+}
+#wrap > div.container, .main-menu div.container{
+ min-width: 800px;
+}
+@media (max-width: 980px) {
+ .sub-menu-wizard{
+ font-size: 11px;
+ }
+}
+@media (max-width: 1200px) {
+ .sub-menu{
+ font-size: 11px;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
new file mode 100644
index 0000000..4ac84b0
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
@@ -0,0 +1,30 @@
+$(function(){
+ $('#checkAll').click(function(){
+ if($(this).is(":checked")){
+ $('table input.js_domainCheck').prop('checked',true);
+ } else{
+ $('table input.js_domainCheck').prop('checked',false);
+ }
+ })
+});
+function manage_selected(action){
+ var checked = "";
+ $('table input.js_domainCheck:checked').each(function(){
+ checked += $(this).val();
+ checked += " - ";
+ });
+ if(action == "activate"){
+ alert('activate-' + checked);
+ }else if(action == "deactivate"){
+ alert('deactivate-' + checked);
+ }else if(action == "delete"){
+ alert('delete-' + checked);
+ }
+}
+function manage_one(action,obj){
+ if(action == "activate"){
+ alert('activate-' + $(obj).attr('data-domain'));
+ }else if(action == "deactivate"){
+ alert('deactivate-' + $(obj).attr('data-domain'));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
new file mode 100644
index 0000000..34735bc
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js
@@ -0,0 +1,18 @@
+$(function () {
+ $('#wizardNext').click(function () {
+ var newStep = parseInt($(this).attr('data-step')) + 1;
+ location.href = '?step='+newStep;
+ });
+ $('#wizardBack').click(function () {
+ var newStep = parseInt($(this).attr('data-step')) - 1;
+ location.href = '?step='+newStep;
+ });
+ $('pre').each(function () {
+ var jsonStr = $(this).html();
+ jsonStr = jsonStr.replace(/\'/g, '\"');
+ var obj = jQuery.parseJSON(jsonStr);
+ jsonStr = JSON.stringify(obj, undefined, 2);
+ $('textarea', $(this).parent()).val(jsonStr);
+ $(this).html(syntaxHighlight(jsonStr));
+ });
+});
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d48fa396
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d48fa396
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d48fa396
Branch: refs/heads/master
Commit: d48fa396fa9c0eb3a1f86f606ed5342130564cfd
Parents: f3a94af e723041
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Jan 16 15:03:48 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Jan 16 15:03:48 2014 +0530
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
Re: [3/4] git commit: commiting changes provided by Chanaka Jayasena, STRATOS-359
Posted by Pradeep Fernando <pr...@gmail.com>.
noted. but at times git signoff fails, but apply works alwasys
On Thu, Jan 16, 2014 at 3:08 PM, Nirmal Fernando <ni...@gmail.com>wrote:
> Hi Pradeep,
>
> I think in this case, it's better to set the original author of the code
> as the Author before committing.
>
>
> On Thu, Jan 16, 2014 at 3:04 PM, <pr...@apache.org> wrote:
>
>> commiting changes provided by Chanaka Jayasena, STRATOS-359
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f3a94af9
>> Tree:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f3a94af9
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f3a94af9
>>
>> Branch: refs/heads/master
>> Commit: f3a94af9cf408a3929f28446f15ab5d75e0923a3
>> Parents: 47f406d
>> Author: Pradeep Fernando <pr...@gmail.com>
>> Authored: Thu Jan 16 15:03:39 2014 +0530
>> Committer: Pradeep Fernando <pr...@gmail.com>
>> Committed: Thu Jan 16 15:03:39 2014 +0530
>>
>> ----------------------------------------------------------------------
>> .../console/configure_stratos_wizard.jag | 28 +
>> .../console/console.ipr | 59 +
>> .../console/console.iws | 719 ++++++
>> .../console/data/config_status.json | 2 +-
>> .../console/data/tenants.json | 19 +
>> .../console/tenant_management.jag | 11 +
>> .../console/tenant_new.jag | 11 +
>> .../partials/configure_stratos_wizard.hbs | 87 +
>> .../console/themes/theme1/partials/header.hbs | 212 +-
>> .../themes/theme1/partials/mycartridges.hbs | 30 +
>> .../theme1/partials/tenant_management.hbs | 92 +
>> .../themes/theme1/partials/tenant_new.hbs | 67 +
>> .../renderers/configure_stratos_wizard.js | 75 +
>> .../console/themes/theme1/renderers/index.js | 66 +-
>> .../theme1/renderers/tenant_management.js | 42 +
>> .../themes/theme1/renderers/tenant_new.js | 42 +
>> .../console/themes/theme1/theme.js | 37 +-
>> .../console/themes/theme1/ui/css/bootstrap.css | 2337 ++++++++++--------
>> .../console/themes/theme1/ui/css/main.css | 116 +-
>> .../themes/theme1/ui/js/tenant_management.js | 30 +
>> .../console/themes/theme1/ui/js/wizard.js | 18 +
>> 21 files changed, 3007 insertions(+), 1093 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> new file mode 100644
>> index 0000000..a4e7730
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> @@ -0,0 +1,28 @@
>> +<%
>> +var caramel = require('caramel');
>> +var step = request.getParameter('step');
>> +if(step == null){
>> + step = 1;
>> +}
>> +
>> +var step_data = {};
>> +
>> +var wizard = {
>> + "step":step
>> +}
>> +if(wizard.step == 1){
>> + step_data = require('data/partition_deployments.json');
>> +}else if(wizard.step == 2){
>> + step_data = require('data/policy_deployments.json');
>> +}else if(wizard.step == 3){
>> + step_data = require('data/lbs.json');
>> +}else if(wizard.step == 4){
>> + step_data = require('data/cartridge_deployments.json');
>> +}else if(wizard.step == 5){
>> + step_data = require('data/mt_service_deployments.json');
>> +}
>> +caramel.render({
>> + step_data:step_data,
>> + wizard:wizard
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.ipr
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/console.ipr
>> b/components/org.apache.stratos.manager.console/console/console.ipr
>> new file mode 100644
>> index 0000000..e157c0c
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/console.ipr
>> @@ -0,0 +1,59 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project version="4">
>> + <component name="CompilerConfiguration">
>> + <option name="DEFAULT_COMPILER" value="Javac" />
>> + <resourceExtensions />
>> + <wildcardResourcePatterns>
>> + <entry name="?*.properties" />
>> + <entry name="?*.xml" />
>> + <entry name="?*.gif" />
>> + <entry name="?*.png" />
>> + <entry name="?*.jpeg" />
>> + <entry name="?*.jpg" />
>> + <entry name="?*.html" />
>> + <entry name="?*.dtd" />
>> + <entry name="?*.tld" />
>> + <entry name="?*.ftl" />
>> + </wildcardResourcePatterns>
>> + <annotationProcessing>
>> + <profile default="true" name="Default" enabled="false">
>> + <processorPath useClasspath="true" />
>> + </profile>
>> + </annotationProcessing>
>> + </component>
>> + <component name="CopyrightManager" default="">
>> + <module2copyright />
>> + </component>
>> + <component name="DependencyValidationManager">
>> + <option name="SKIP_IMPORT_STATEMENTS" value="false" />
>> + </component>
>> + <component name="Encoding" useUTFGuessing="true"
>> native2AsciiForPropertiesFiles="false" />
>> + <component name="ProjectModuleManager">
>> + <modules>
>> + <module fileurl="file://$PROJECT_DIR$/console.iml"
>> filepath="$PROJECT_DIR$/console.iml" />
>> + </modules>
>> + </component>
>> + <component name="ProjectRootManager" version="2"
>> languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
>> + <output url="file://$PROJECT_DIR$/out" />
>> + </component>
>> + <component name="VcsDirectoryMappings">
>> + <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
>> + </component>
>> + <component name="masterDetails">
>> + <states>
>> + <state key="ProjectJDKs.UI">
>> + <settings>
>> + <last-edited>1.6</last-edited>
>> + <splitter-proportions>
>> + <option name="proportions">
>> + <list>
>> + <option value="0.2" />
>> + </list>
>> + </option>
>> + </splitter-proportions>
>> + </settings>
>> + </state>
>> + </states>
>> + </component>
>> +</project>
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.iws
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/console.iws
>> b/components/org.apache.stratos.manager.console/console/console.iws
>> new file mode 100644
>> index 0000000..d75ecf7
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/console.iws
>> @@ -0,0 +1,719 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project version="4">
>> + <component name="ChangeListManager">
>> + <list default="true" id="2a216222-994f-4b4b-8241-afb5024e6741"
>> name="Default" comment="" />
>> + <ignored path="console.iws" />
>> + <ignored path=".idea/workspace.xml" />
>> + <option name="TRACKING_ENABLED" value="true" />
>> + <option name="SHOW_DIALOG" value="false" />
>> + <option name="HIGHLIGHT_CONFLICTS" value="true" />
>> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
>> + <option name="LAST_RESOLUTION" value="IGNORE" />
>> + </component>
>> + <component name="ChangesViewManager" flattened_view="true"
>> show_ignored="false" />
>> + <component name="CreatePatchCommitExecutor">
>> + <option name="PATCH_PATH" value="" />
>> + </component>
>> + <component name="DaemonCodeAnalyzer">
>> + <disable_hints />
>> + </component>
>> + <component name="DebuggerManager">
>> + <breakpoint_any default_suspend_policy="SuspendAll"
>> default_condition_enabled="true">
>> + <breakpoint>
>> + <option name="NOTIFY_CAUGHT" value="true" />
>> + <option name="NOTIFY_UNCAUGHT" value="true" />
>> + <option name="ENABLED" value="false" />
>> + <option name="LOG_ENABLED" value="false" />
>> + <option name="LOG_EXPRESSION_ENABLED" value="false" />
>> + <option name="REMOVE_AFTER_HIT" value="false" />
>> + <option name="SUSPEND_POLICY" value="SuspendAll" />
>> + <option name="SUSPEND" value="true" />
>> + <option name="COUNT_FILTER_ENABLED" value="false" />
>> + <option name="COUNT_FILTER" value="0" />
>> + <option name="CONDITION_ENABLED" value="true" />
>> + <option name="CLASS_FILTERS_ENABLED" value="false" />
>> + <option name="INSTANCE_FILTERS_ENABLED" value="false" />
>> + <option name="CONDITION" value="" />
>> + <option name="LOG_MESSAGE" value="" />
>> + </breakpoint>
>> + <breakpoint>
>> + <option name="NOTIFY_CAUGHT" value="true" />
>> + <option name="NOTIFY_UNCAUGHT" value="true" />
>> + <option name="ENABLED" value="false" />
>> + <option name="LOG_ENABLED" value="false" />
>> + <option name="LOG_EXPRESSION_ENABLED" value="false" />
>> + <option name="REMOVE_AFTER_HIT" value="false" />
>> + <option name="SUSPEND_POLICY" value="SuspendAll" />
>> + <option name="SUSPEND" value="true" />
>> + <option name="COUNT_FILTER_ENABLED" value="false" />
>> + <option name="COUNT_FILTER" value="0" />
>> + <option name="CONDITION_ENABLED" value="true" />
>> + <option name="CLASS_FILTERS_ENABLED" value="false" />
>> + <option name="INSTANCE_FILTERS_ENABLED" value="false" />
>> + <option name="CONDITION" value="" />
>> + <option name="LOG_MESSAGE" value="" />
>> + </breakpoint>
>> + </breakpoint_any>
>> + <ui_properties default_suspend_policy="SuspendAll"
>> default_condition_enabled="true" />
>> + <breakpoint_rules />
>> + <ui_properties />
>> + </component>
>> + <component name="ExecutionTargetManager"
>> SELECTED_TARGET="default_target" />
>> + <component name="FavoritesManager">
>> + <favorites_list name="console" />
>> + </component>
>> + <component name="FileEditorManager">
>> + <leaf>
>> + <file leaf-file-name="utility.jag" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/util/utility.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="96" column="50" selection-start="2566"
>> selection-end="2595" vertical-scroll-proportion="-18.208334"
>> vertical-offset="1003" max-vertical-offset="2385">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="acl.jag" pinned="false" current="true"
>> current-in-tab="true">
>> + <entry file="file://$PROJECT_DIR$/util/acl.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="74" column="86" selection-start="2685"
>> selection-end="2714" vertical-scroll-proportion="0.686907"
>> vertical-offset="748" max-vertical-offset="1275">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="security.manager.js" pinned="false"
>> current="false" current-in-tab="false">
>> + <entry
>> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="0" column="0" selection-start="0"
>> selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="634"
>> max-vertical-offset="1185">
>> + <folding>
>> + <element signature="n#!!doc" expanded="true" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="acs.jag" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="41" column="103" selection-start="2059"
>> selection-end="2059" vertical-scroll-proportion="-14.375"
>> vertical-offset="270" max-vertical-offset="1530">
>> + <folding>
>> + <marker date="1389674842353" expanded="true"
>> signature="16:4412" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="550:818" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="997:1105" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1137:3910" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1314:3804" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1422:3793" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1503:3779" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="2686:3761" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="3505:3738" placeholder="//..." />
>> + <marker date="1389674842353" expanded="true"
>> signature="3810:3904" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="4011:4410" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="acl.json" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/config/acl.json">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="9" column="22" selection-start="0"
>> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
>> max-vertical-offset="225">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="router.jag" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/controllers/router.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="88" column="45" selection-start="2371"
>> selection-end="2371" vertical-scroll-proportion="-17.5"
>> vertical-offset="900" max-vertical-offset="1515">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="index.jag" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/index.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="4" column="30" selection-start="170"
>> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
>> max-vertical-offset="195">
>> + <folding>
>> + <marker date="1389333163237" expanded="true"
>> signature="169:210" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="jaggery.conf" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/jaggery.conf">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="13" column="1" selection-start="344"
>> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="285">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="login.jag" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/controllers/login.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="11" column="67" selection-start="555"
>> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
>> max-vertical-offset="630">
>> + <folding>
>> + <marker date="1389516957973" expanded="true"
>> signature="14:1581" placeholder="{...}" />
>> + <marker date="1389516957973" expanded="true"
>> signature="625:1579" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + <file leaf-file-name="console.json" pinned="false" current="false"
>> current-in-tab="false">
>> + <entry file="file://$PROJECT_DIR$/config/console.json">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="21" column="26" selection-start="529"
>> selection-end="529" vertical-scroll-proportion="-13.125"
>> vertical-offset="0" max-vertical-offset="585">
>> + <folding>
>> + <marker date="1389783850689" expanded="true"
>> signature="0:957" placeholder="{...}" />
>> + <marker date="1389783850689" expanded="true"
>> signature="499:528" placeholder="{"MGT": "/mgt"...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + </file>
>> + </leaf>
>> + </component>
>> + <component name="FindManager">
>> + <FindUsagesManager>
>> + <setting name="OPEN_NEW_TAB" value="false" />
>> + </FindUsagesManager>
>> + </component>
>> + <component name="Git.Settings">
>> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
>> + </component>
>> + <component name="IdeDocumentHistory">
>> + <option name="changedFiles">
>> + <list>
>> + <option value="$PROJECT_DIR$/cartridges.jag" />
>> + <option
>> value="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" />
>> + <option value="$PROJECT_DIR$/util/utility.jag" />
>> + <option
>> value="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" />
>> + <option value="$PROJECT_DIR$/README.md" />
>> + <option value="$PROJECT_DIR$/controllers/login.jag" />
>> + <option value="$PROJECT_DIR$/util/authUtils.jag" />
>> + <option value="$PROJECT_DIR$/controllers/acs.jag" />
>> + <option value="$PROJECT_DIR$/jaggery.conf" />
>> + <option value="$PROJECT_DIR$/config/console.json" />
>> + <option value="$PROJECT_DIR$/index.jag" />
>> + <option value="$PROJECT_DIR$/config/acl.json" />
>> + <option value="$PROJECT_DIR$/util/acl.jag" />
>> + <option value="$PROJECT_DIR$/controllers/router.jag" />
>> + </list>
>> + </option>
>> + </component>
>> + <component name="ProjectFrameBounds">
>> + <option name="y" value="24" />
>> + <option name="width" value="1366" />
>> + <option name="height" value="720" />
>> + </component>
>> + <component name="ProjectLevelVcsManager" settingsEditedManually="true">
>> + <OptionsSetting value="true" id="Add" />
>> + <OptionsSetting value="true" id="Remove" />
>> + <OptionsSetting value="true" id="Checkout" />
>> + <OptionsSetting value="true" id="Update" />
>> + <OptionsSetting value="true" id="Status" />
>> + <OptionsSetting value="true" id="Edit" />
>> + <ConfirmationsSetting value="0" id="Add" />
>> + <ConfirmationsSetting value="0" id="Remove" />
>> + </component>
>> + <component name="ProjectReloadState">
>> + <option name="STATE" value="0" />
>> + </component>
>> + <component name="ProjectView">
>> + <navigator currentView="ProjectPane" proportions="" version="1"
>> splitterProportion="0.5">
>> + <flattenPackages />
>> + <showMembers />
>> + <showModules />
>> + <showLibraryContents />
>> + <hideEmptyPackages />
>> + <abbreviatePackageNames />
>> + <autoscrollToSource />
>> + <autoscrollFromSource />
>> + <sortByType />
>> + </navigator>
>> + <panes>
>> + <pane id="ProjectPane">
>> + <subPane>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="util" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="themes" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="themes" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="theme1" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="themes" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="theme1" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="partials" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="modules" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="modules" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="security" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="controllers" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + <PATH>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="console" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + <PATH_ELEMENT>
>> + <option name="myItemId" value="config" />
>> + <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> + </PATH_ELEMENT>
>> + </PATH>
>> + </subPane>
>> + </pane>
>> + <pane id="PackagesPane" />
>> + <pane id="Scope" />
>> + </panes>
>> + </component>
>> + <component name="PropertiesComponent">
>> + <property name="GoToFile.includeJavaFiles" value="false" />
>> + <property name="GoToClass.toSaveIncludeLibraries" value="false" />
>> + <property name="MemberChooser.sorted" value="false" />
>> + <property name="MemberChooser.showClasses" value="true" />
>> + <property name="GoToClass.includeLibraries" value="false" />
>> + <property name="MemberChooser.copyJavadoc" value="false" />
>> + <property name="LayoutCode.rearrangeEntriesHTML" value="false" />
>> + <property name="LayoutCode.rearrangeEntriesPlain text" value="false"
>> />
>> + <property name="LayoutCode.rearrangeEntriesJSON" value="false" />
>> + </component>
>> + <component name="RunManager">
>> + <configuration default="true" type="Remote" factoryName="Remote">
>> + <option name="USE_SOCKET_TRANSPORT" value="true" />
>> + <option name="SERVER_MODE" value="false" />
>> + <option name="SHMEM_ADDRESS" value="javadebug" />
>> + <option name="HOST" value="localhost" />
>> + <option name="PORT" value="5005" />
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="JavascriptDebugType"
>> factoryName="JavaScript Debug" singleton="true">
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="FlexUnitRunConfigurationType"
>> factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name=""
>> emulatorAdlOptions="" method_name="" output_log_level="null"
>> package_name="" scope="Class">
>> + <option name="BCName" value="" />
>> + <option name="launcherParameters">
>> + <LauncherParameters>
>> + <option name="browserFamily" value="FIREFOX" />
>> + <option name="launcherType" value="OSDefault" />
>> + <option name="newPlayerInstance" value="false" />
>> + <option name="playerPath" value="/usr/bin/flashplayerdebugger"
>> />
>> + </LauncherParameters>
>> + </option>
>> + <option name="moduleName" value="" />
>> + <option name="trusted" value="true" />
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="Applet" factoryName="Applet">
>> + <module name="" />
>> + <option name="MAIN_CLASS_NAME" />
>> + <option name="HTML_FILE_NAME" />
>> + <option name="HTML_USED" value="false" />
>> + <option name="WIDTH" value="400" />
>> + <option name="HEIGHT" value="300" />
>> + <option name="POLICY_FILE"
>> value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
>> + <option name="VM_PARAMETERS" />
>> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> + <option name="ALTERNATIVE_JRE_PATH" />
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="Application"
>> factoryName="Application">
>> + <extension name="coverage" enabled="false" merge="false"
>> sample_coverage="true" runner="idea" />
>> + <option name="MAIN_CLASS_NAME" />
>> + <option name="VM_PARAMETERS" />
>> + <option name="PROGRAM_PARAMETERS" />
>> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
>> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> + <option name="ALTERNATIVE_JRE_PATH" />
>> + <option name="ENABLE_SWING_INSPECTOR" value="false" />
>> + <option name="ENV_VARIABLES" />
>> + <option name="PASS_PARENT_ENVS" value="true" />
>> + <module name="" />
>> + <envs />
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="JUnit" factoryName="JUnit">
>> + <extension name="coverage" enabled="false" merge="false"
>> sample_coverage="true" runner="idea" />
>> + <module name="" />
>> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> + <option name="ALTERNATIVE_JRE_PATH" />
>> + <option name="PACKAGE_NAME" />
>> + <option name="MAIN_CLASS_NAME" />
>> + <option name="METHOD_NAME" />
>> + <option name="TEST_OBJECT" value="class" />
>> + <option name="VM_PARAMETERS" value="-ea" />
>> + <option name="PARAMETERS" />
>> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
>> + <option name="ENV_VARIABLES" />
>> + <option name="PASS_PARENT_ENVS" value="true" />
>> + <option name="TEST_SEARCH_SCOPE">
>> + <value defaultName="moduleWithDependencies" />
>> + </option>
>> + <envs />
>> + <patterns />
>> + <method />
>> + </configuration>
>> + <configuration default="true" type="FlashRunConfigurationType"
>> factoryName="Flash App">
>> + <option name="BCName" value="" />
>> + <option name="IOSSimulatorSdkPath" value="" />
>> + <option name="adlOptions" value="" />
>> + <option name="airProgramParameters" value="" />
>> + <option name="appDescriptorForEmulator" value="Android" />
>> + <option name="debugTransport" value="USB" />
>> + <option name="debuggerSdkRaw" value="BC SDK" />
>> + <option name="emulator" value="NexusOne" />
>> + <option name="emulatorAdlOptions" value="" />
>> + <option name="fastPackaging" value="true" />
>> + <option name="fullScreenHeight" value="0" />
>> + <option name="fullScreenWidth" value="0" />
>> + <option name="launchUrl" value="false" />
>> + <option name="launcherParameters">
>> + <LauncherParameters>
>> + <option name="browserFamily" value="FIREFOX" />
>> + <option name="launcherType" value="OSDefault" />
>> + <option name="newPlayerInstance" value="false" />
>> + <option name="playerPath" value="/usr/bin/flashplayerdebugger"
>> />
>> + </LauncherParameters>
>> + </option>
>> + <option name="mobileRunTarget" value="Emulator" />
>> + <option name="moduleName" value="" />
>> + <option name="overriddenMainClass" value="" />
>> + <option name="overriddenOutputFileName" value="" />
>> + <option name="overrideMainClass" value="false" />
>> + <option name="runTrusted" value="true" />
>> + <option name="screenDpi" value="0" />
>> + <option name="screenHeight" value="0" />
>> + <option name="screenWidth" value="0" />
>> + <option name="url" value="http://" />
>> + <option name="usbDebugPort" value="7936" />
>> + <method />
>> + </configuration>
>> + <list size="0" />
>> + <configuration name="<template>" type="WebApp" default="true"
>> selected="false">
>> + <Host>localhost</Host>
>> + <Port>5050</Port>
>> + </configuration>
>> + </component>
>> + <component name="ShelveChangesManager" show_recycled="false" />
>> + <component name="SvnConfiguration" maxAnnotateRevisions="500"
>> myUseAcceleration="nothing" myAutoUpdateAfterCommit="false"
>> cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
>> + <option name="USER" value="" />
>> + <option name="PASSWORD" value="" />
>> + <option name="mySSHConnectionTimeout" value="30000" />
>> + <option name="mySSHReadTimeout" value="30000" />
>> + <option name="LAST_MERGED_REVISION" />
>> + <option name="MERGE_DRY_RUN" value="false" />
>> + <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
>> + <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
>> + <option name="IGNORE_SPACES_IN_MERGE" value="false" />
>> + <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
>> + <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
>> + <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
>> + <option name="FORCE_UPDATE" value="false" />
>> + <option name="IGNORE_EXTERNALS" value="false" />
>> + <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
>> + </component>
>> + <component name="ToolWindowManager">
>> + <frame x="0" y="24" width="1366" height="720" extended-state="1" />
>> + <editor active="true" />
>> + <layout>
>> + <window_info id="Changes" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Palette" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Database" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Ant Build" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.25" sideWeight="0.5" order="1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Debug" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"
>> />
>> + <window_info id="Event Log" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="true"
>> content_ui="tabs" />
>> + <window_info id="Favorites" active="false" anchor="left"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="true"
>> content_ui="tabs" />
>> + <window_info id="Version Control" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="TODO" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="6" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Structure" active="false" anchor="left"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.25" sideWeight="0.5" order="1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Maven Projects" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Application Servers" active="false"
>> anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED"
>> visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Project" active="false" anchor="left"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
>> weight="0.24962178" sideWeight="0.5" order="0" side_tool="false"
>> content_ui="combo" />
>> + <window_info id="Run" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="2" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Cvs" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.25" sideWeight="0.5" order="4" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Message" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="0" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Find" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="1" side_tool="false"
>> content_ui="tabs" />
>> + <window_info id="Commander" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs"
>> />
>> + <window_info id="Inspection" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs"
>> />
>> + <window_info id="Hierarchy" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.25" sideWeight="0.5" order="2" side_tool="false"
>> content_ui="combo" />
>> + </layout>
>> + </component>
>> + <component name="UnknownFeatures">
>> + <option featureType="com.intellij.fileTypeFactory"
>> implementationName="*.conf" />
>> + </component>
>> + <component name="Vcs.Log.UiProperties">
>> + <option name="RECENTLY_FILTERED_USERS">
>> + <collection />
>> + </option>
>> + </component>
>> + <component name="VcsContentAnnotationSettings">
>> + <option name="myLimit" value="2678400000" />
>> + </component>
>> + <component name="VcsManagerConfiguration">
>> + <option name="myTodoPanelSettings">
>> + <TodoPanelSettings />
>> + </option>
>> + </component>
>> + <component name="XDebuggerManager">
>> + <breakpoint-manager />
>> + </component>
>> + <component name="editorHistoryManager">
>> + <entry file="file://$PROJECT_DIR$/cartridges.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="7" column="2" selection-start="245"
>> selection-end="245" vertical-scroll-proportion="-4.375" vertical-offset="0"
>> max-vertical-offset="195">
>> + <folding>
>> + <marker date="1389332136797" expanded="true"
>> signature="-1:-1" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry
>> file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="6" column="5" selection-start="248"
>> selection-end="248" vertical-scroll-proportion="-3.75" vertical-offset="0"
>> max-vertical-offset="195">
>> + <folding>
>> + <marker date="1389355612584" expanded="true"
>> signature="-1:-1" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry
>> file="file://$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="22" column="43" selection-start="1032"
>> selection-end="1032" vertical-scroll-proportion="-11.875"
>> vertical-offset="45" max-vertical-offset="1470">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/README.md">
>> + <provider
>> editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
>> + <state />
>> + </provider>
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="11" column="0" selection-start="292"
>> selection-end="292" vertical-scroll-proportion="-3.235294"
>> vertical-offset="0" max-vertical-offset="255">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="41" column="103" selection-start="2059"
>> selection-end="2059" vertical-scroll-proportion="-14.375"
>> vertical-offset="270" max-vertical-offset="1530">
>> + <folding>
>> + <marker date="1389674842353" expanded="true"
>> signature="16:4412" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="550:818" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="997:1105" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1137:3910" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1314:3804" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1422:3793" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="1503:3779" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="2686:3761" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="3505:3738" placeholder="//..." />
>> + <marker date="1389674842353" expanded="true"
>> signature="3810:3904" placeholder="{...}" />
>> + <marker date="1389674842353" expanded="true"
>> signature="4011:4410" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/controllers/login.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="11" column="67" selection-start="555"
>> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
>> max-vertical-offset="630">
>> + <folding>
>> + <marker date="1389516957973" expanded="true"
>> signature="14:1581" placeholder="{...}" />
>> + <marker date="1389516957973" expanded="true"
>> signature="625:1579" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/jaggery.conf">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="13" column="1" selection-start="344"
>> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="285">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/config/console.json">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="21" column="26" selection-start="529"
>> selection-end="529" vertical-scroll-proportion="-13.125"
>> vertical-offset="0" max-vertical-offset="585">
>> + <folding>
>> + <marker date="1389783850689" expanded="true"
>> signature="0:957" placeholder="{...}" />
>> + <marker date="1389783850689" expanded="true"
>> signature="499:528" placeholder="{"MGT": "/mgt"...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/themes/theme1/theme.js">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="0" column="0" selection-start="0" selection-end="0"
>> vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="551">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/util/utility.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="96" column="50" selection-start="2566"
>> selection-end="2595" vertical-scroll-proportion="-18.208334"
>> vertical-offset="1003" max-vertical-offset="2385">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry
>> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="0" column="0" selection-start="0" selection-end="0"
>> vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="1185">
>> + <folding>
>> + <element signature="n#!!doc" expanded="true" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/index.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="4" column="30" selection-start="170"
>> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
>> max-vertical-offset="195">
>> + <folding>
>> + <marker date="1389333163237" expanded="true"
>> signature="169:210" placeholder="{...}" />
>> + </folding>
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/controllers/router.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="88" column="45" selection-start="2371"
>> selection-end="2371" vertical-scroll-proportion="-17.5"
>> vertical-offset="900" max-vertical-offset="1515">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/config/acl.json">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="9" column="22" selection-start="0"
>> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
>> max-vertical-offset="225">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + <entry file="file://$PROJECT_DIR$/util/acl.jag">
>> + <provider selected="true" editor-type-id="text-editor">
>> + <state line="74" column="86" selection-start="2685"
>> selection-end="2714" vertical-scroll-proportion="0.686907"
>> vertical-offset="748" max-vertical-offset="1275">
>> + <folding />
>> + </state>
>> + </provider>
>> + </entry>
>> + </component>
>> +</project>
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/config_status.json
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/data/config_status.json
>> b/components/org.apache.stratos.manager.console/console/data/config_status.json
>> index 1c73caa..163aa03 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/data/config_status.json
>> +++
>> b/components/org.apache.stratos.manager.console/console/data/config_status.json
>> @@ -1,4 +1,4 @@
>> {
>> "first_use":false,
>> - "not_complete":true
>> + "not_complete":false
>> }
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/tenants.json
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/data/tenants.json
>> b/components/org.apache.stratos.manager.console/console/data/tenants.json
>> new file mode 100644
>> index 0000000..11caa11
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/data/tenants.json
>> @@ -0,0 +1,19 @@
>> +[
>> + {
>> + "active":true,
>> + "domain":"mysite.com",
>> + "email":"admin@mysite.com",
>> + "created":"16th Dec 13 - 23:55"
>> + },{
>> + "active":false,
>> + "domain":"yoursite.com",
>> + "email":"chanaka@yoursite.com",
>> + "created":"15th Jan 14 - 13:45"
>> + },{
>> + "active":true,
>> + "domain":"mysite2.com",
>> + "email":"admin@mysite2.com",
>> + "created":"16th Dec 13 - 23:55"
>> + },
>> +
>> +]
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> new file mode 100644
>> index 0000000..cfaa805
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> @@ -0,0 +1,11 @@
>> +<%
>> +var caramel = require('caramel');
>> +var tenants = require('data/tenants.json');
>> +var config_status = require('/data/config_status.json');
>> +var log = new Log();
>> +log.info(tenants);
>> +caramel.render({
>> + tenants:tenants,
>> + config_status:config_status
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> b/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> new file mode 100644
>> index 0000000..cfaa805
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> @@ -0,0 +1,11 @@
>> +<%
>> +var caramel = require('caramel');
>> +var tenants = require('data/tenants.json');
>> +var config_status = require('/data/config_status.json');
>> +var log = new Log();
>> +log.info(tenants);
>> +caramel.render({
>> + tenants:tenants,
>> + config_status:config_status
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> new file mode 100644
>> index 0000000..125d1a4
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> @@ -0,0 +1,87 @@
>> +<div class="container content-starter">
>> + <div class="row">
>> + <div class="col-lg-12">
>> + <h1>Configure Stratos - {{title}}</h1>
>> + </div>
>> + </div>
>> +</div>
>> +<div class="container" id="addItemSection">
>> + <div class="row">
>> + <div class="col-md-12">
>> + <form role="form">
>> + <i class="icons-help icons-small-size"></i> Add
>> at least one {{title}}.
>> + <div style="clear: both"></div>
>> + <label for="policy" class="required"
>> style="margin-top:10px;">Policy Configuration</label>
>> + <div class="container">
>> + <div class="row">
>> + <div class="col-md-6
>> padding-remover-left">
>> + <textarea class="form-control"
>> rows="11" id="policy"></textarea>
>> + <button data-step="{{step}}"
>> type="button" class="btn btn-default" {{#unless wizard_on_2}}
>> disabled="disabled" {{/unless}} id="wizardBack" id="wizardBack"><<
>> Back</button>
>> + <button data-step="{{step}}"
>> type="button" class="btn {{#unless
>> wizard_on_5}}btn-primary{{else}}btn-default{{/unless}}" id="wizardNext"
>> {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button>
>> + <button data-step="{{step}}"
>> type="button" class="btn {{#if
>> wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish"
>> {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button>
>> + </div>
>> + <div class="col-md-6">
>> + <i class="icons-help"></i>
>> + Example configuration:
>> + <pre>
>> + {
>> + "partition":{
>> + "id": "P1",
>> + "provider": "ec2",
>> + "property": [
>> + {
>> + "name": "region",
>> + "value": "ap-southeast-1"
>> + }
>> + ],
>> + "partitionMin": "1",
>> + "partitionMax": "3"
>> + }
>> + }
>> + </pre>
>> + </div>
>> + </div>
>> +
>> + </div>
>> +
>> +
>> + </form>
>> +
>> + </div>
>> + </div>
>> + </div>
>> +
>> +<div class="container">
>> +
>> + <div class="row">
>> + <div class="col-md-12">
>> +
>> +
>> + <div class="panel-group" id="accordion">
>> +
>> +
>> + {{#each step_data}}
>> + <div class="panel panel-default">
>> + <div class="panel-heading">
>> + <h4 class="panel-title">
>> + <a data-toggle="collapse"
>> data-parent="#accordion" href="#collapse{{key}}">
>> + {{name}}
>> + </a>
>> + </h4>
>> + </div>
>> + <div id="collapse{{key}}" class="panel-collapse
>> collapse">
>> + <div class="panel-body">
>> + <pre>{{policy}}</pre>
>> + </div>
>> + </div>
>> + </div>
>> + {{/each}}
>> +
>> +
>> +
>> + </div>
>> + </div>
>> + </div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url "/themes/theme1/ui/js/wizard.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> index 673070f..3ad7353 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> @@ -19,13 +19,21 @@
>> </div>
>> <div class="col-lg-9 custom-nav">
>> <ul class="pull-left">
>> - <li {{#if dashboard}} class="active" {{/if}}><a
>> href="{{url "/"}}"><i class="fa fa-dashboard"></i>
>> <span><br>Dashboard</span></a></li>
>> - <li {{#if partition_deployments}} class="active"
>> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
>> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
>> - <li {{#if tenant_mgt}} class="active" {{/if}}><a
>> href="{{url "/"}}"><i class="fa fa-user"></i> <span><br>Tenant
>> Mgt</span></a></li>
>> - <li {{#if my_cartridges}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My
>> Cartridges</span></a></li>
>> + <!-- li {{#if dashboard}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i>
>> <span><br>Dashboard</span></a></li -->
>> + <li {{#if my_cartridges}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My
>> Cartridges</span></a></li>
>> + <li {{#if configure_stratos}} class="active"
>> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
>> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
>> + <li {{#if tenant_mgt}} class="active" {{/if}}><a
>> href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i>
>> <span><br>Tenant Mgt</span></a></li>
>> </ul>
>> <ul class="pull-right">
>> - <li><a><i class="icon-user"></i><br> logout
>> section</a></li>
>> + <li class="dropdown">
>> + <a href="#" class="dropdown-toggle"
>> data-toggle="dropdown"><i class="fa fa-user"></i><br /> Username <b
>> class="caret"></b></a>
>> + <ul class="dropdown-menu">
>> + <li><a><i class="fa
>> fa-file-text-o"></i> View Profile</a></li>
>> + <li>
>> + <a><i class="fa fa-sign-out"></i>
>> logout</a>
>> + </li>
>> + </ul>
>> + </li>
>> </ul>
>> </div>
>> </div>
>> @@ -35,55 +43,164 @@
>> <div class="breadcrumb-strip">
>> <div class="container">
>> <div class="row">
>> -
>> - <div class="col-lg-3">
>> - <a class="btn {{button.class_name}}" href="{{url
>> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
>> - </div>
>> - <div class="col-lg-9 help-section">
>> - {{#if has_help}}
>> - <i class="icons-help"></i>
>> - <p>{{help}}</p>
>> + {{#unless wizard_on}}
>> + <div class="col-lg-3">
>> + <a class="btn {{button.class_name}}" href="{{url
>> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
>> + </div>
>> + {{#if has_action_buttons}}
>> + <div class="col-lg-3">
>> + <button class="btn btn-default"
>> onclick="manage_selected('activate')" type="button">Activate</button>
>> + <button class="btn btn-default"
>> onclick="manage_selected('deactivate')">Deactivate</button>
>> + <button class="btn btn-default"
>> onclick="manage_selected('delete')">Delete</button>
>> + </div>
>> + <div class="col-lg-6 help-section">
>> + {{#if has_help}}
>> + <i class="icons-help"></i>
>> + <p>{{help}}</p>
>> + {{/if}}
>> + </div>
>> + {{else}}
>> + <div class="col-lg-9 help-section">
>> + {{#if has_help}}
>> + <i class="icons-help"></i>
>> + <p>{{help}}</p>
>> + {{/if}}
>> + {{#unless has_help}}
>> + <ul class="sub-menu">
>> + <li {{#if partition_deployments}}
>> class="active" {{/if}}>
>> + {{#if config_status.first_use}}
>> + <span>Partition
>> Deployments</span>
>> + {{else}}
>> + <a href="{{url
>> "/partition_deployments.jag" }}">Partition Deployments</a>
>> + {{/if}}
>> + </li>
>> + <li {{#if policy_deployments}}
>> class="active" {{/if}}>
>> + {{#if config_status.first_use}}
>> + <span>Policy Deployments</span>
>> + {{else}}
>> + <a href="{{url
>> "/policy_deployments.jag" }}">Policy Deployments</a>
>> + {{/if}}
>> + </li>
>> + <li {{#if lbs}} class="active" {{/if}}>
>> + {{#if config_status.first_use}}
>> + <span>LBs</span>
>> + {{else}}
>> + <a href="{{url "/lbs.jag"
>> }}">LBs</a>
>> + {{/if}}
>> + </li>
>> + <li {{#if cartridge_deployments}}
>> class="active" {{/if}}>
>> + {{#if config_status.first_use}}
>> + <span>Cartridge
>> Deployments</span>
>> + {{else}}
>> + <a href="{{url
>> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
>> + {{/if}}
>> + </li>
>> + <li {{#if mt_service_deployments}}
>> class="active" {{/if}}>
>> + {{#if config_status.first_use}}
>> + <span>Multi-Tenant Service
>> Deployments</span>
>> + {{else}}
>> + <a href="{{url
>> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
>> + {{/if}}
>> + </li>
>> + </ul>
>> + {{/unless}} <!-- hasHelp -->
>> + </div>
>> {{/if}}
>> - {{#unless has_help}}
>> - <ul class="sub-menu">
>> - <li {{#if partition_deployments}} class="active"
>> {{/if}}>
>> - {{#if config_status.first_use}}
>> - <span>Partition Deployments</span>
>> - {{else}}
>> - <a href="{{url
>> "/partition_deployments.jag" }}">Partition Deployments</a>
>> - {{/if}}
>> + {{/unless}} <!-- wizardon -->
>> +
>> + {{#if wizard_on}}
>> + <div class="col-lg-12">
>> +
>> + <ul class="sub-menu-wizard">
>> + <li class="active">
>> + <a href="{{url
>> "/configure_stratos_wizard.jag?step=1" }}">
>> + <div class="wizard-number">1</div>
>> + <div>Partition Deployments</div>
>> + </a>
>> </li>
>> - <li {{#if policy_deployments}} class="active"
>> {{/if}}>
>> - {{#if config_status.first_use}}
>> - <span>Policy Deployments</span>
>> - {{else}}
>> - <a href="{{url "/policy_deployments.jag"
>> }}">Policy Deployments</a>
>> - {{/if}}
>> + <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
>> +
>> +
>> +
>> + {{#if wizard_on_2}}
>> + <li class="active">
>> + <a href="{{url
>> "/configure_stratos_wizard.jag?step=2" }}">
>> + <div class="wizard-number">2</div>
>> + <div>Policy Deployments</div>
>> + </a>
>> </li>
>> - <li {{#if lbs}} class="active" {{/if}}>
>> - {{#if config_status.first_use}}
>> - <span>LBs</span>
>> - {{else}}
>> - <a href="{{url "/lbs.jag" }}">LBs</a>
>> - {{/if}}
>> + <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
>> + {{else}}
>> + <li>
>> + <div class="in-active-wizard-item">
>> + <div class="wizard-number">2</div>
>> + <div>Policy Deployments</div>
>> + </div>
>> </li>
>> - <li {{#if cartridge_deployments}} class="active"
>> {{/if}}>
>> - {{#if config_status.first_use}}
>> - <span>Cartridge Deployments</span>
>> - {{else}}
>> - <a href="{{url
>> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
>> - {{/if}}
>> + <li class="sub-menu-wizard-pointer"></li>
>> + {{/if}}
>> +
>> +
>> + {{#if wizard_on_3}}
>> + <li class="active">
>> + <a href="{{url
>> "/configure_stratos_wizard.jag?step=3" }}">
>> + <div class="wizard-number">3</div>
>> + <div>LBs</div>
>> + </a>
>> </li>
>> - <li {{#if mt_service_deployments}}
>> class="active" {{/if}}>
>> - {{#if config_status.first_use}}
>> - <span>Multi-Tenant Service
>> Deployments</span>
>> - {{else}}
>> - <a href="{{url
>> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
>> - {{/if}}
>> + <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
>> + {{else}}
>> + <li>
>> + <div class="in-active-wizard-item">
>> + <div class="wizard-number">3</div>
>> + <div>LBs</div>
>> + </div>
>> </li>
>> + <li class="sub-menu-wizard-pointer"></li>
>> + {{/if}}
>> +
>> +
>> + {{#if wizard_on_4}}
>> + <li class="active">
>> + <a href="{{url
>> "/configure_stratos_wizard.jag?step=4" }}">
>> + <div class="wizard-number">4</div>
>> + <div>Cartridge Deployments</div>
>> + </a>
>> + </li>
>> + <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
>> + {{else}}
>> + <li>
>> + <div class="in-active-wizard-item">
>> + <div class="wizard-number">4</div>
>> + <div>Cartridge Deployments</div>
>> + </div>
>> + </li>
>> + <li class="sub-menu-wizard-pointer"></li>
>> + {{/if}}
>> +
>> +
>> + {{#if wizard_on_5}}
>> + <li class="active">
>> + <a href="{{url
>> "/configure_stratos_wizard.jag?step=5" }}">
>> + <div class="wizard-number">5</div>
>> + <div>Multi-Tenant Service
>> Deployments</div>
>> + </a>
>> + </li>
>> + <li class="sub-menu-wizard-pointer
>> active-pointer no-background"></li>
>> + {{else}}
>> + <li>
>> + <div class="in-active-wizard-item">
>> + <div class="wizard-number">5</div>
>> + <div>Multi-Tenant Service
>> Deployments</div>
>> + </div>
>> + </li>
>> + <li class="sub-menu-wizard-pointer
>> no-background"></li>
>> + {{/if}}
>> +
>> </ul>
>> - {{/unless}}
>> +
>> </div>
>> + {{/if}}
>> </div>
>> </div>
>> </div>
>> @@ -102,4 +219,5 @@
>> {{/if}}
>> </div>
>>
>> -{{/unless}}
>> \ No newline at end of file
>> +{{/unless}}
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> index 0964be9..2e5d831 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> @@ -5,3 +5,33 @@
>> </div>
>> </div>
>> </div>
>> +{{#each cartridges}}
>> +<div class="container">
>> + <div class="row">
>> + <div class="col-lg-12">
>> + <div class="h2-wrapper"><h2>{{kind}}</h2></div>
>> + </div>
>> + </div>
>> + <div class="row">
>> + {{#each cartridges}}
>> + <div class="col-md-6">
>> + <div class="box-container">
>> + <div class="container">
>> + <div class="row">
>> + <div class="col-lg-3">
>> + <div class="box-left"><i
>> class="icons-{{cartridgeType}} big-pro-icons"></i></div>
>> + <div
>> class="big-pro-icons-title">{{version}}</div>
>> + </div>
>> + <div class="col-lg-9">
>> + <a href="{{url
>> "/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a>
>> + <div
>> class="cartridge-description">{{description}}</div>
>> +
>> + </div>
>> + </div>
>> + </div>
>> + </div>
>> + </div>
>> + {{/each}}
>> + </div>
>> +</div>
>> +{{/each}}
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> new file mode 100644
>> index 0000000..ee1a41f
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> @@ -0,0 +1,92 @@
>> +<div class="container content-starter">
>> + <div class="row">
>> + <div class="col-lg-12">
>> + <h1>{{title}}</h1>
>> + </div>
>> + </div>
>> +</div>
>> +<div class="container" style="display: none;" id="addItemSection">
>> + <div class="row">
>> + <div class="col-md-12">
>> + <h2>Deploy New Partition</h2>
>> + <form role="form">
>> + <label for="policy" class="required">Partition
>> Configuration</label>
>> +
>> + <div class="container">
>> + <div class="row">
>> + <div class="col-md-6
>> padding-remover-left">
>> + <textarea class="form-control"
>> rows="11" id="policy"></textarea>
>> + <button type="button" class="btn
>> btn-primary" id="deployPolicy">Deploy Partition</button>
>> + <a>Cancel</a>
>> + </div>
>> + <div class="col-md-6">
>> + <i class="icons-help"></i>
>> + Example configuration:
>> + <pre>
>> + {
>> + "partition":{
>> + "id": "P1",
>> + "provider": "ec2",
>> + "property": [
>> + {
>> + "name": "region",
>> + "value": "ap-southeast-1"
>> + }
>> + ],
>> + "partitionMin": "1",
>> + "partitionMax": "3"
>> + }
>> + }
>> + </pre>
>> + </div>
>> + </div>
>> +
>> + </div>
>> +
>> +
>> + </form>
>> +
>> + </div>
>> + </div>
>> + </div>
>> +
>> +<div class="container">
>> +
>> + <div class="row">
>> + <div class="col-md-12">
>> + <div class="table-responsive">
>> + <table class="table table-striped">
>> + <thead>
>> + <tr>
>> + <th> <input type="checkbox"
>> id="checkAll"/></th>
>> + <th>State:</th>
>> + <th>Domain:</th>
>> + <th>Email:</th>
>> + <th>
>> + Created:
>> + <div>DD Mon YY - HH:MM</div>
>> + </th>
>> + </tr>
>> + </thead>
>> + <tbody>
>> + {{#each tenants}}
>> + <tr>
>> + <td><input value="{{domain}}"
>> type="checkbox" {{#if active}}checked="checked"{{/if}}
>> class="js_domainCheck" /></td>
>> + <td><a title="Click to {{#if
>> active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if
>> active}}}deactivate{{else}}activate{{/if}}',this)"
>> data-domain="{{domain}}"><i class="fa {{#if active}}}fa-check-circle-o
>> green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td>
>> + <td><a>{{domain}}</a></td>
>> + <td>{{email}}</td>
>> + <td>{{created}}</td>
>> + </tr>
>> + {{/each}}
>> + </tbody>
>> + </table>
>> + </div>
>> +
>> +
>> +
>> +
>> + </div>
>> + </div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url
>> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> new file mode 100644
>> index 0000000..aecd7a9
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> @@ -0,0 +1,67 @@
>> +<div class="container content-starter">
>> + <div class="row">
>> + <div class="col-lg-12">
>> + <h1>{{title}}</h1>
>> + </div>
>> + </div>
>> +</div>
>> +<div class="container">
>> +<div class="row">
>> + <div class="col-md-12">
>> + <form method="post" action="{{url "/tenant_management.jag" }}">
>> + <div class="h2-wrapper"><h2>Domain Information</h2></div>
>> + <label class="required">Domain:</label>
>> + <div class="form-inline"><input type="text" placeholder="
>> example.com"/> <button class="btn btn-default">Check
>> Availability</button></div>
>> + <label><input type="checkbox"/> Validate the domain now
>> (Optional)</label>
>> +
>> + <div class="h2-wrapper"><h2>Usage Plan Information</h2></div>
>> + <label class="required">Select usage plan:</label>
>> + <select>
>> + <option>Enterprise</option>
>> + </select>
>> + <a>More Info</a>
>> +
>> + <div class="h2-wrapper"><h2>Contact Details</h2></div>
>> +
>> + <div class="col-md-3 padding-remover-left">
>> + <label class="required">First Name:</label>
>> + <input type="text"/>
>> + </div>
>> + <div class="col-md-3">
>> + <label class="required">Last Name:</label>
>> + <input type="text"/>
>> + </div>
>> + <div class="clearfix"></div>
>> + <label class="required">Admin User Name:</label>
>> + <input type="text"/>
>> + <div class="clearfix"></div>
>> +
>> + <div class="col-md-3 padding-remover-left">
>> + <label class="required">Admin Password:</label>
>> + <input type="text"/>
>> + </div>
>> + <div class="col-md-3">
>> + <label class="required">Admin Password (Repeat):</label>
>> + <input type="text"/>
>> + </div>
>> +
>> + <div class="clearfix"></div>
>> + <label class="required">Email:</label>
>> + <input type="text"/>
>> +
>> + <label class="required">Are you human?</label>
>> + <div style="padding-bottom:10px;"><i class="icons-help
>> icons-small-size"></i> Type the characters you see in the picture
>> below.</div>
>> + <div class="clearfix"></div>
>> + <input type="text"/>
>> +
>> + <div class="h2-wrapper"><h2>Terms of Use</h2></div>
>> + <div class="terms-of-use">Lorem ipsum dolor sit amet,
>> consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium,
>> at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque.
>> Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est,
>> pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien.</div>
>> + <label><input type="checkbox"/> I agree</label>
>> +
>> + <button class="btn btn-primary" type="submit">Add new
>> Tenant</button>
>> + </form>
>> + </div>
>> +</div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url
>> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> new file mode 100644
>> index 0000000..c59751a
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> @@ -0,0 +1,75 @@
>> +var render = function (theme, data, meta, require) {
>> + for(var i=0;i<data.step_data.length;i++){
>> + data.step_data[i].key = data.step_data[i].name.replace(/ /g,'');
>> + }
>> + var title;
>> + var wizard_on_val = [];
>> + for(var i=0; i<5 ;i++){
>> + if(i <= data.wizard.step-1){
>> + wizard_on_val.push(true);
>> + }else{
>> + wizard_on_val.push(false);
>> + }
>> + }
>> + var config_status = data.wizard;
>> + if( config_status.step == 1 ){
>> + title = 'Partition Deployment';
>> + }else if( config_status.step == 2 ){
>> + title = 'Policy Deployment';
>> + }else if( config_status.step == 3 ){
>> + title = 'Lb';
>> + }else if( config_status.step == 4 ){
>> + title = 'Cartridge Deployment';
>> + }else if( config_status.step == 5 ){
>> + title = 'Multi-Tenant Service Deployment';
>> + }
>> + theme('index', {
>> + body: [
>> + {
>> + partial: 'configure_stratos_wizard',
>> + context: {
>> + title:title,
>> + step_data:data.step_data,
>> + step:config_status.step,
>> + wizard_on_1:wizard_on_val[0],
>> + wizard_on_2:wizard_on_val[1],
>> + wizard_on_3:wizard_on_val[2],
>> + wizard_on_4:wizard_on_val[3],
>> + wizard_on_5:wizard_on_val[4]
>> + }
>> + }
>> + ],
>> + header: [
>> + {
>> + partial: 'header',
>> + context:{
>> + title:'Configure Stratos',
>> + button:{
>> + link:'/',
>> + name:'Deploy New Cartridge',
>> + class_name:''
>> + },
>> + has_help:false,
>> + step_data:true,
>> + config_status:data.config_status,
>> + wizard_on:true,
>> + wizard_on_1:wizard_on_val[0],
>> + wizard_on_2:wizard_on_val[1],
>> + wizard_on_3:wizard_on_val[2],
>> + wizard_on_4:wizard_on_val[3],
>> + wizard_on_5:wizard_on_val[4],
>> + step:step,
>> + configure_stratos:true
>> + }
>> + }
>> + ],
>> + title:[
>> + {
>> + partial:'title',
>> + context:{
>> + title:title
>> + }
>> + }
>> + ]
>> + });
>> +};
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> index 35c4375..37b30dc 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> @@ -1,34 +1,38 @@
>> var render = function (theme, data, meta, require) {
>> - // Re-create the data structure of the cartridges.
>> - /* var mycartridges = [
>> - {
>> - kind: "cartridges",
>> - cartridges: []}
>> - ];
>> - var cartridgesToPush;
>> - for(var i=0;i<data.mycartridges.length;i++){
>> - if(data.mycartridges[i].category == undefined){
>> - cartridgesToPush = null;
>> - for(var j=0;j<mycartridges.length;j++){
>> - if(mycartridges[j].kind == "cartridges" ){
>> - cartridgesToPush = mycartridges[j].cartridges;
>> - }
>> - }
>> - cartridgesToPush.push(data.mycartridges[i]);
>> - }else{
>> - cartridgesToPush = null;
>> - for (var j = 0; j < mycartridges.length; j++) {
>> - if (mycartridges[j].kind == data.mycartridges[i].category) {
>> - cartridgesToPush = mycartridges[j].cartridges;
>> - }
>> - }
>> - if(cartridgesToPush == null){
>> -
>> mycartridges.push({kind:data.mycartridges[i].category,cartridges:[data.mycartridges[i]]})
>> - }else{
>> - cartridgesToPush.push(data.mycartridges[i]);
>> - }
>> - }
>> - }*/
>> + // Re-create the data structure of the cartridges.
>> + var log = new Log();
>> + var cartridges_old = data.mycartridges.cartridge;
>> + var cartridges_new = [
>> + {
>> + kind: "Cartridges",
>> + cartridges: []}
>> + ];
>> + var cartridgesToPush;
>> + for (var i = 0; i < cartridges_old.length; i++) {
>> + if (cartridges_old[i].category == undefined) {
>> + cartridgesToPush = null;
>> + for (var j = 0; j < cartridges_new.length; j++) {
>> + if (cartridges_new[j].kind == "Cartridges") {
>> + cartridgesToPush = cartridges_new[j].cartridges;
>> + }
>> + }
>> + cartridgesToPush.push(cartridges_old[i]);
>> + log.info(cartridges_old[i]);
>> + } else {
>> + cartridgesToPush = null;
>> + for (var j = 0; j < cartridges_new.length; j++) {
>> + if (cartridges_new[j].kind ==
>> cartridges_old[i].category) {
>> + cartridgesToPush = cartridges_new[j].cartridges;
>> + }
>> + }
>> + if (cartridgesToPush == null) {
>> + cartridges_new.push({kind: cartridges_old[i].category,
>> cartridges: [cartridges_old[i]]})
>> + } else {
>> + cartridgesToPush.push(cartridges_old[i]);
>> + }
>> + }
>> + }
>> + log.info(cartridges_new);
>>
>> theme('index', {
>> body: [
>> @@ -36,7 +40,7 @@ var render = function (theme, data, meta, require) {
>> partial: 'mycartridges',
>> context: {
>> title: 'My Cartridges',
>> - mycartridges: {}
>> + mycartridges: cartridges_new
>> }
>> }
>> ],
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> new file mode 100644
>> index 0000000..8b676ab
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> @@ -0,0 +1,42 @@
>> +var render = function (theme, data, meta, require) {
>> +
>> + var create_btn_class = 'btn-important';
>> + var title = 'Tenant Management';
>> + theme('index', {
>> + body: [
>> + {
>> + partial: 'tenant_management',
>> + context: {
>> + title:title,
>> + tenants:data.tenants
>> + }
>> + }
>> + ],
>> + header: [
>> + {
>> + partial: 'header',
>> + context:{
>> + title:'Tenant Management',
>> + button:{
>> + link:'/tenant_new.jag',
>> + name:'Add New Tenant',
>> + class_name:create_btn_class
>> + },
>> + has_help:true,
>> + help:"Tenants you create has permission to view and
>> subscribe to Cartridges. Tenants don't have permission to do Partition
>> deployment, Policy deployment, LB Creation, and MT service deployment.",
>> + tenant_mgt:true,
>> + config_status:data.config_status,
>> + has_action_buttons:true
>> + }
>> + }
>> + ],
>> + title:[
>> + {
>> + partial:'title',
>> + context:{
>> + title:title
>> + }
>> + }
>> + ]
>> + });
>> +};
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> new file mode 100644
>> index 0000000..3ae7026
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> @@ -0,0 +1,42 @@
>> +var render = function (theme, data, meta, require) {
>> +
>> + var create_btn_class = 'btn-default';
>> + var title = 'Tenant Management - Add New Tenant';
>> + theme('index', {
>> + body: [
>> + {
>> + partial: 'tenant_new',
>> + context: {
>> + title:title,
>> + tenants:data.tenants
>> + }
>> + }
>> + ],
>> + header: [
>> + {
>> + partial: 'header',
>> + context:{
>> + title:title,
>> + button:{
>> + link:'/tenant_management.jag',
>> + name:'Tenant Management',
>> + class_name:create_btn_class,
>> + class_icon:'fa fa-arrow-left'
>> + },
>> + has_help:true,
>> + help:"Tenants you create has permission to view and
>> subscribe to Cartridges. Tenants don't have permission to do Partition
>> deployment, Policy deployment, LB Creation, and MT service deployment.",
>> + tenant_mgt:true,
>> + config_status:data.config_status
>> + }
>> + }
>> + ],
>> + title:[
>> + {
>> + partial:'title',
>> + context:{
>> + title:title
>> + }
>> + }
>> + ]
>> + });
>> +};
>> \ No newline at end of file
>>
>>
>
>
> --
> Best Regards,
> Nirmal
>
> Nirmal Fernando.
> PPMC Member & Committer of Apache Stratos,
> Senior Software Engineer, WSO2 Inc.
>
> Blog: http://nirmalfdo.blogspot.com/
>
--
Pradeep Fernando.
http://pradeepfernando.blogspot.com/
Re: [3/4] git commit: commiting changes provided by Chanaka Jayasena, STRATOS-359
Posted by Nirmal Fernando <ni...@gmail.com>.
Hi Pradeep,
I think in this case, it's better to set the original author of the code as
the Author before committing.
On Thu, Jan 16, 2014 at 3:04 PM, <pr...@apache.org> wrote:
> commiting changes provided by Chanaka Jayasena, STRATOS-359
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f3a94af9
> Tree:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f3a94af9
> Diff:
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f3a94af9
>
> Branch: refs/heads/master
> Commit: f3a94af9cf408a3929f28446f15ab5d75e0923a3
> Parents: 47f406d
> Author: Pradeep Fernando <pr...@gmail.com>
> Authored: Thu Jan 16 15:03:39 2014 +0530
> Committer: Pradeep Fernando <pr...@gmail.com>
> Committed: Thu Jan 16 15:03:39 2014 +0530
>
> ----------------------------------------------------------------------
> .../console/configure_stratos_wizard.jag | 28 +
> .../console/console.ipr | 59 +
> .../console/console.iws | 719 ++++++
> .../console/data/config_status.json | 2 +-
> .../console/data/tenants.json | 19 +
> .../console/tenant_management.jag | 11 +
> .../console/tenant_new.jag | 11 +
> .../partials/configure_stratos_wizard.hbs | 87 +
> .../console/themes/theme1/partials/header.hbs | 212 +-
> .../themes/theme1/partials/mycartridges.hbs | 30 +
> .../theme1/partials/tenant_management.hbs | 92 +
> .../themes/theme1/partials/tenant_new.hbs | 67 +
> .../renderers/configure_stratos_wizard.js | 75 +
> .../console/themes/theme1/renderers/index.js | 66 +-
> .../theme1/renderers/tenant_management.js | 42 +
> .../themes/theme1/renderers/tenant_new.js | 42 +
> .../console/themes/theme1/theme.js | 37 +-
> .../console/themes/theme1/ui/css/bootstrap.css | 2337 ++++++++++--------
> .../console/themes/theme1/ui/css/main.css | 116 +-
> .../themes/theme1/ui/js/tenant_management.js | 30 +
> .../console/themes/theme1/ui/js/wizard.js | 18 +
> 21 files changed, 3007 insertions(+), 1093 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
> new file mode 100644
> index 0000000..a4e7730
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
> @@ -0,0 +1,28 @@
> +<%
> +var caramel = require('caramel');
> +var step = request.getParameter('step');
> +if(step == null){
> + step = 1;
> +}
> +
> +var step_data = {};
> +
> +var wizard = {
> + "step":step
> +}
> +if(wizard.step == 1){
> + step_data = require('data/partition_deployments.json');
> +}else if(wizard.step == 2){
> + step_data = require('data/policy_deployments.json');
> +}else if(wizard.step == 3){
> + step_data = require('data/lbs.json');
> +}else if(wizard.step == 4){
> + step_data = require('data/cartridge_deployments.json');
> +}else if(wizard.step == 5){
> + step_data = require('data/mt_service_deployments.json');
> +}
> +caramel.render({
> + step_data:step_data,
> + wizard:wizard
> +});
> +%>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.ipr
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/console.ipr
> b/components/org.apache.stratos.manager.console/console/console.ipr
> new file mode 100644
> index 0000000..e157c0c
> --- /dev/null
> +++ b/components/org.apache.stratos.manager.console/console/console.ipr
> @@ -0,0 +1,59 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<project version="4">
> + <component name="CompilerConfiguration">
> + <option name="DEFAULT_COMPILER" value="Javac" />
> + <resourceExtensions />
> + <wildcardResourcePatterns>
> + <entry name="?*.properties" />
> + <entry name="?*.xml" />
> + <entry name="?*.gif" />
> + <entry name="?*.png" />
> + <entry name="?*.jpeg" />
> + <entry name="?*.jpg" />
> + <entry name="?*.html" />
> + <entry name="?*.dtd" />
> + <entry name="?*.tld" />
> + <entry name="?*.ftl" />
> + </wildcardResourcePatterns>
> + <annotationProcessing>
> + <profile default="true" name="Default" enabled="false">
> + <processorPath useClasspath="true" />
> + </profile>
> + </annotationProcessing>
> + </component>
> + <component name="CopyrightManager" default="">
> + <module2copyright />
> + </component>
> + <component name="DependencyValidationManager">
> + <option name="SKIP_IMPORT_STATEMENTS" value="false" />
> + </component>
> + <component name="Encoding" useUTFGuessing="true"
> native2AsciiForPropertiesFiles="false" />
> + <component name="ProjectModuleManager">
> + <modules>
> + <module fileurl="file://$PROJECT_DIR$/console.iml"
> filepath="$PROJECT_DIR$/console.iml" />
> + </modules>
> + </component>
> + <component name="ProjectRootManager" version="2"
> languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
> + <output url="file://$PROJECT_DIR$/out" />
> + </component>
> + <component name="VcsDirectoryMappings">
> + <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
> + </component>
> + <component name="masterDetails">
> + <states>
> + <state key="ProjectJDKs.UI">
> + <settings>
> + <last-edited>1.6</last-edited>
> + <splitter-proportions>
> + <option name="proportions">
> + <list>
> + <option value="0.2" />
> + </list>
> + </option>
> + </splitter-proportions>
> + </settings>
> + </state>
> + </states>
> + </component>
> +</project>
> +
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.iws
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/console.iws
> b/components/org.apache.stratos.manager.console/console/console.iws
> new file mode 100644
> index 0000000..d75ecf7
> --- /dev/null
> +++ b/components/org.apache.stratos.manager.console/console/console.iws
> @@ -0,0 +1,719 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<project version="4">
> + <component name="ChangeListManager">
> + <list default="true" id="2a216222-994f-4b4b-8241-afb5024e6741"
> name="Default" comment="" />
> + <ignored path="console.iws" />
> + <ignored path=".idea/workspace.xml" />
> + <option name="TRACKING_ENABLED" value="true" />
> + <option name="SHOW_DIALOG" value="false" />
> + <option name="HIGHLIGHT_CONFLICTS" value="true" />
> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
> + <option name="LAST_RESOLUTION" value="IGNORE" />
> + </component>
> + <component name="ChangesViewManager" flattened_view="true"
> show_ignored="false" />
> + <component name="CreatePatchCommitExecutor">
> + <option name="PATCH_PATH" value="" />
> + </component>
> + <component name="DaemonCodeAnalyzer">
> + <disable_hints />
> + </component>
> + <component name="DebuggerManager">
> + <breakpoint_any default_suspend_policy="SuspendAll"
> default_condition_enabled="true">
> + <breakpoint>
> + <option name="NOTIFY_CAUGHT" value="true" />
> + <option name="NOTIFY_UNCAUGHT" value="true" />
> + <option name="ENABLED" value="false" />
> + <option name="LOG_ENABLED" value="false" />
> + <option name="LOG_EXPRESSION_ENABLED" value="false" />
> + <option name="REMOVE_AFTER_HIT" value="false" />
> + <option name="SUSPEND_POLICY" value="SuspendAll" />
> + <option name="SUSPEND" value="true" />
> + <option name="COUNT_FILTER_ENABLED" value="false" />
> + <option name="COUNT_FILTER" value="0" />
> + <option name="CONDITION_ENABLED" value="true" />
> + <option name="CLASS_FILTERS_ENABLED" value="false" />
> + <option name="INSTANCE_FILTERS_ENABLED" value="false" />
> + <option name="CONDITION" value="" />
> + <option name="LOG_MESSAGE" value="" />
> + </breakpoint>
> + <breakpoint>
> + <option name="NOTIFY_CAUGHT" value="true" />
> + <option name="NOTIFY_UNCAUGHT" value="true" />
> + <option name="ENABLED" value="false" />
> + <option name="LOG_ENABLED" value="false" />
> + <option name="LOG_EXPRESSION_ENABLED" value="false" />
> + <option name="REMOVE_AFTER_HIT" value="false" />
> + <option name="SUSPEND_POLICY" value="SuspendAll" />
> + <option name="SUSPEND" value="true" />
> + <option name="COUNT_FILTER_ENABLED" value="false" />
> + <option name="COUNT_FILTER" value="0" />
> + <option name="CONDITION_ENABLED" value="true" />
> + <option name="CLASS_FILTERS_ENABLED" value="false" />
> + <option name="INSTANCE_FILTERS_ENABLED" value="false" />
> + <option name="CONDITION" value="" />
> + <option name="LOG_MESSAGE" value="" />
> + </breakpoint>
> + </breakpoint_any>
> + <ui_properties default_suspend_policy="SuspendAll"
> default_condition_enabled="true" />
> + <breakpoint_rules />
> + <ui_properties />
> + </component>
> + <component name="ExecutionTargetManager"
> SELECTED_TARGET="default_target" />
> + <component name="FavoritesManager">
> + <favorites_list name="console" />
> + </component>
> + <component name="FileEditorManager">
> + <leaf>
> + <file leaf-file-name="utility.jag" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/util/utility.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="96" column="50" selection-start="2566"
> selection-end="2595" vertical-scroll-proportion="-18.208334"
> vertical-offset="1003" max-vertical-offset="2385">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="acl.jag" pinned="false" current="true"
> current-in-tab="true">
> + <entry file="file://$PROJECT_DIR$/util/acl.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="74" column="86" selection-start="2685"
> selection-end="2714" vertical-scroll-proportion="0.686907"
> vertical-offset="748" max-vertical-offset="1275">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="security.manager.js" pinned="false"
> current="false" current-in-tab="false">
> + <entry
> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="0" column="0" selection-start="0"
> selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="634"
> max-vertical-offset="1185">
> + <folding>
> + <element signature="n#!!doc" expanded="true" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="acs.jag" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="41" column="103" selection-start="2059"
> selection-end="2059" vertical-scroll-proportion="-14.375"
> vertical-offset="270" max-vertical-offset="1530">
> + <folding>
> + <marker date="1389674842353" expanded="true"
> signature="16:4412" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="550:818" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="997:1105" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1137:3910" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1314:3804" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1422:3793" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1503:3779" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="2686:3761" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="3505:3738" placeholder="//..." />
> + <marker date="1389674842353" expanded="true"
> signature="3810:3904" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="4011:4410" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="acl.json" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/config/acl.json">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="9" column="22" selection-start="0"
> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
> max-vertical-offset="225">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="router.jag" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/controllers/router.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="88" column="45" selection-start="2371"
> selection-end="2371" vertical-scroll-proportion="-17.5"
> vertical-offset="900" max-vertical-offset="1515">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="index.jag" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/index.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="4" column="30" selection-start="170"
> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
> max-vertical-offset="195">
> + <folding>
> + <marker date="1389333163237" expanded="true"
> signature="169:210" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="jaggery.conf" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/jaggery.conf">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="13" column="1" selection-start="344"
> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
> max-vertical-offset="285">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="login.jag" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/controllers/login.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="11" column="67" selection-start="555"
> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
> max-vertical-offset="630">
> + <folding>
> + <marker date="1389516957973" expanded="true"
> signature="14:1581" placeholder="{...}" />
> + <marker date="1389516957973" expanded="true"
> signature="625:1579" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + </file>
> + <file leaf-file-name="console.json" pinned="false" current="false"
> current-in-tab="false">
> + <entry file="file://$PROJECT_DIR$/config/console.json">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="21" column="26" selection-start="529"
> selection-end="529" vertical-scroll-proportion="-13.125"
> vertical-offset="0" max-vertical-offset="585">
> + <folding>
> + <marker date="1389783850689" expanded="true"
> signature="0:957" placeholder="{...}" />
> + <marker date="1389783850689" expanded="true"
> signature="499:528" placeholder="{"MGT": "/mgt"...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + </file>
> + </leaf>
> + </component>
> + <component name="FindManager">
> + <FindUsagesManager>
> + <setting name="OPEN_NEW_TAB" value="false" />
> + </FindUsagesManager>
> + </component>
> + <component name="Git.Settings">
> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
> + </component>
> + <component name="IdeDocumentHistory">
> + <option name="changedFiles">
> + <list>
> + <option value="$PROJECT_DIR$/cartridges.jag" />
> + <option
> value="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" />
> + <option value="$PROJECT_DIR$/util/utility.jag" />
> + <option
> value="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" />
> + <option value="$PROJECT_DIR$/README.md" />
> + <option value="$PROJECT_DIR$/controllers/login.jag" />
> + <option value="$PROJECT_DIR$/util/authUtils.jag" />
> + <option value="$PROJECT_DIR$/controllers/acs.jag" />
> + <option value="$PROJECT_DIR$/jaggery.conf" />
> + <option value="$PROJECT_DIR$/config/console.json" />
> + <option value="$PROJECT_DIR$/index.jag" />
> + <option value="$PROJECT_DIR$/config/acl.json" />
> + <option value="$PROJECT_DIR$/util/acl.jag" />
> + <option value="$PROJECT_DIR$/controllers/router.jag" />
> + </list>
> + </option>
> + </component>
> + <component name="ProjectFrameBounds">
> + <option name="y" value="24" />
> + <option name="width" value="1366" />
> + <option name="height" value="720" />
> + </component>
> + <component name="ProjectLevelVcsManager" settingsEditedManually="true">
> + <OptionsSetting value="true" id="Add" />
> + <OptionsSetting value="true" id="Remove" />
> + <OptionsSetting value="true" id="Checkout" />
> + <OptionsSetting value="true" id="Update" />
> + <OptionsSetting value="true" id="Status" />
> + <OptionsSetting value="true" id="Edit" />
> + <ConfirmationsSetting value="0" id="Add" />
> + <ConfirmationsSetting value="0" id="Remove" />
> + </component>
> + <component name="ProjectReloadState">
> + <option name="STATE" value="0" />
> + </component>
> + <component name="ProjectView">
> + <navigator currentView="ProjectPane" proportions="" version="1"
> splitterProportion="0.5">
> + <flattenPackages />
> + <showMembers />
> + <showModules />
> + <showLibraryContents />
> + <hideEmptyPackages />
> + <abbreviatePackageNames />
> + <autoscrollToSource />
> + <autoscrollFromSource />
> + <sortByType />
> + </navigator>
> + <panes>
> + <pane id="ProjectPane">
> + <subPane>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="util" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="themes" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="themes" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="theme1" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="themes" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="theme1" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="partials" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="modules" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="modules" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="security" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="controllers" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + <PATH>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="console" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + <PATH_ELEMENT>
> + <option name="myItemId" value="config" />
> + <option name="myItemType"
> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
> + </PATH_ELEMENT>
> + </PATH>
> + </subPane>
> + </pane>
> + <pane id="PackagesPane" />
> + <pane id="Scope" />
> + </panes>
> + </component>
> + <component name="PropertiesComponent">
> + <property name="GoToFile.includeJavaFiles" value="false" />
> + <property name="GoToClass.toSaveIncludeLibraries" value="false" />
> + <property name="MemberChooser.sorted" value="false" />
> + <property name="MemberChooser.showClasses" value="true" />
> + <property name="GoToClass.includeLibraries" value="false" />
> + <property name="MemberChooser.copyJavadoc" value="false" />
> + <property name="LayoutCode.rearrangeEntriesHTML" value="false" />
> + <property name="LayoutCode.rearrangeEntriesPlain text" value="false"
> />
> + <property name="LayoutCode.rearrangeEntriesJSON" value="false" />
> + </component>
> + <component name="RunManager">
> + <configuration default="true" type="Remote" factoryName="Remote">
> + <option name="USE_SOCKET_TRANSPORT" value="true" />
> + <option name="SERVER_MODE" value="false" />
> + <option name="SHMEM_ADDRESS" value="javadebug" />
> + <option name="HOST" value="localhost" />
> + <option name="PORT" value="5005" />
> + <method />
> + </configuration>
> + <configuration default="true" type="JavascriptDebugType"
> factoryName="JavaScript Debug" singleton="true">
> + <method />
> + </configuration>
> + <configuration default="true" type="FlexUnitRunConfigurationType"
> factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name=""
> emulatorAdlOptions="" method_name="" output_log_level="null"
> package_name="" scope="Class">
> + <option name="BCName" value="" />
> + <option name="launcherParameters">
> + <LauncherParameters>
> + <option name="browserFamily" value="FIREFOX" />
> + <option name="launcherType" value="OSDefault" />
> + <option name="newPlayerInstance" value="false" />
> + <option name="playerPath" value="/usr/bin/flashplayerdebugger"
> />
> + </LauncherParameters>
> + </option>
> + <option name="moduleName" value="" />
> + <option name="trusted" value="true" />
> + <method />
> + </configuration>
> + <configuration default="true" type="Applet" factoryName="Applet">
> + <module name="" />
> + <option name="MAIN_CLASS_NAME" />
> + <option name="HTML_FILE_NAME" />
> + <option name="HTML_USED" value="false" />
> + <option name="WIDTH" value="400" />
> + <option name="HEIGHT" value="300" />
> + <option name="POLICY_FILE"
> value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
> + <option name="VM_PARAMETERS" />
> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
> + <option name="ALTERNATIVE_JRE_PATH" />
> + <method />
> + </configuration>
> + <configuration default="true" type="Application"
> factoryName="Application">
> + <extension name="coverage" enabled="false" merge="false"
> sample_coverage="true" runner="idea" />
> + <option name="MAIN_CLASS_NAME" />
> + <option name="VM_PARAMETERS" />
> + <option name="PROGRAM_PARAMETERS" />
> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
> + <option name="ALTERNATIVE_JRE_PATH" />
> + <option name="ENABLE_SWING_INSPECTOR" value="false" />
> + <option name="ENV_VARIABLES" />
> + <option name="PASS_PARENT_ENVS" value="true" />
> + <module name="" />
> + <envs />
> + <method />
> + </configuration>
> + <configuration default="true" type="JUnit" factoryName="JUnit">
> + <extension name="coverage" enabled="false" merge="false"
> sample_coverage="true" runner="idea" />
> + <module name="" />
> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
> + <option name="ALTERNATIVE_JRE_PATH" />
> + <option name="PACKAGE_NAME" />
> + <option name="MAIN_CLASS_NAME" />
> + <option name="METHOD_NAME" />
> + <option name="TEST_OBJECT" value="class" />
> + <option name="VM_PARAMETERS" value="-ea" />
> + <option name="PARAMETERS" />
> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
> + <option name="ENV_VARIABLES" />
> + <option name="PASS_PARENT_ENVS" value="true" />
> + <option name="TEST_SEARCH_SCOPE">
> + <value defaultName="moduleWithDependencies" />
> + </option>
> + <envs />
> + <patterns />
> + <method />
> + </configuration>
> + <configuration default="true" type="FlashRunConfigurationType"
> factoryName="Flash App">
> + <option name="BCName" value="" />
> + <option name="IOSSimulatorSdkPath" value="" />
> + <option name="adlOptions" value="" />
> + <option name="airProgramParameters" value="" />
> + <option name="appDescriptorForEmulator" value="Android" />
> + <option name="debugTransport" value="USB" />
> + <option name="debuggerSdkRaw" value="BC SDK" />
> + <option name="emulator" value="NexusOne" />
> + <option name="emulatorAdlOptions" value="" />
> + <option name="fastPackaging" value="true" />
> + <option name="fullScreenHeight" value="0" />
> + <option name="fullScreenWidth" value="0" />
> + <option name="launchUrl" value="false" />
> + <option name="launcherParameters">
> + <LauncherParameters>
> + <option name="browserFamily" value="FIREFOX" />
> + <option name="launcherType" value="OSDefault" />
> + <option name="newPlayerInstance" value="false" />
> + <option name="playerPath" value="/usr/bin/flashplayerdebugger"
> />
> + </LauncherParameters>
> + </option>
> + <option name="mobileRunTarget" value="Emulator" />
> + <option name="moduleName" value="" />
> + <option name="overriddenMainClass" value="" />
> + <option name="overriddenOutputFileName" value="" />
> + <option name="overrideMainClass" value="false" />
> + <option name="runTrusted" value="true" />
> + <option name="screenDpi" value="0" />
> + <option name="screenHeight" value="0" />
> + <option name="screenWidth" value="0" />
> + <option name="url" value="http://" />
> + <option name="usbDebugPort" value="7936" />
> + <method />
> + </configuration>
> + <list size="0" />
> + <configuration name="<template>" type="WebApp" default="true"
> selected="false">
> + <Host>localhost</Host>
> + <Port>5050</Port>
> + </configuration>
> + </component>
> + <component name="ShelveChangesManager" show_recycled="false" />
> + <component name="SvnConfiguration" maxAnnotateRevisions="500"
> myUseAcceleration="nothing" myAutoUpdateAfterCommit="false"
> cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
> + <option name="USER" value="" />
> + <option name="PASSWORD" value="" />
> + <option name="mySSHConnectionTimeout" value="30000" />
> + <option name="mySSHReadTimeout" value="30000" />
> + <option name="LAST_MERGED_REVISION" />
> + <option name="MERGE_DRY_RUN" value="false" />
> + <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
> + <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
> + <option name="IGNORE_SPACES_IN_MERGE" value="false" />
> + <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
> + <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
> + <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
> + <option name="FORCE_UPDATE" value="false" />
> + <option name="IGNORE_EXTERNALS" value="false" />
> + <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
> + </component>
> + <component name="ToolWindowManager">
> + <frame x="0" y="24" width="1366" height="720" extended-state="1" />
> + <editor active="true" />
> + <layout>
> + <window_info id="Changes" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Palette" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Database" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Ant Build" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.25" sideWeight="0.5" order="1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Debug" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"
> />
> + <window_info id="Event Log" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="true"
> content_ui="tabs" />
> + <window_info id="Favorites" active="false" anchor="left"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="true"
> content_ui="tabs" />
> + <window_info id="Version Control" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="TODO" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="6" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Structure" active="false" anchor="left"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.25" sideWeight="0.5" order="1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Maven Projects" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Application Servers" active="false"
> anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED"
> visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Project" active="false" anchor="left"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
> weight="0.24962178" sideWeight="0.5" order="0" side_tool="false"
> content_ui="combo" />
> + <window_info id="Run" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="2" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Cvs" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.25" sideWeight="0.5" order="4" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Message" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="0" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Find" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.33" sideWeight="0.5" order="1" side_tool="false"
> content_ui="tabs" />
> + <window_info id="Commander" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs"
> />
> + <window_info id="Inspection" active="false" anchor="bottom"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs"
> />
> + <window_info id="Hierarchy" active="false" anchor="right"
> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
> weight="0.25" sideWeight="0.5" order="2" side_tool="false"
> content_ui="combo" />
> + </layout>
> + </component>
> + <component name="UnknownFeatures">
> + <option featureType="com.intellij.fileTypeFactory"
> implementationName="*.conf" />
> + </component>
> + <component name="Vcs.Log.UiProperties">
> + <option name="RECENTLY_FILTERED_USERS">
> + <collection />
> + </option>
> + </component>
> + <component name="VcsContentAnnotationSettings">
> + <option name="myLimit" value="2678400000" />
> + </component>
> + <component name="VcsManagerConfiguration">
> + <option name="myTodoPanelSettings">
> + <TodoPanelSettings />
> + </option>
> + </component>
> + <component name="XDebuggerManager">
> + <breakpoint-manager />
> + </component>
> + <component name="editorHistoryManager">
> + <entry file="file://$PROJECT_DIR$/cartridges.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="7" column="2" selection-start="245"
> selection-end="245" vertical-scroll-proportion="-4.375" vertical-offset="0"
> max-vertical-offset="195">
> + <folding>
> + <marker date="1389332136797" expanded="true"
> signature="-1:-1" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry
> file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="6" column="5" selection-start="248"
> selection-end="248" vertical-scroll-proportion="-3.75" vertical-offset="0"
> max-vertical-offset="195">
> + <folding>
> + <marker date="1389355612584" expanded="true"
> signature="-1:-1" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry
> file="file://$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="22" column="43" selection-start="1032"
> selection-end="1032" vertical-scroll-proportion="-11.875"
> vertical-offset="45" max-vertical-offset="1470">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/README.md">
> + <provider
> editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
> + <state />
> + </provider>
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="11" column="0" selection-start="292"
> selection-end="292" vertical-scroll-proportion="-3.235294"
> vertical-offset="0" max-vertical-offset="255">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="41" column="103" selection-start="2059"
> selection-end="2059" vertical-scroll-proportion="-14.375"
> vertical-offset="270" max-vertical-offset="1530">
> + <folding>
> + <marker date="1389674842353" expanded="true"
> signature="16:4412" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="550:818" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="997:1105" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1137:3910" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1314:3804" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1422:3793" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="1503:3779" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="2686:3761" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="3505:3738" placeholder="//..." />
> + <marker date="1389674842353" expanded="true"
> signature="3810:3904" placeholder="{...}" />
> + <marker date="1389674842353" expanded="true"
> signature="4011:4410" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/controllers/login.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="11" column="67" selection-start="555"
> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
> max-vertical-offset="630">
> + <folding>
> + <marker date="1389516957973" expanded="true"
> signature="14:1581" placeholder="{...}" />
> + <marker date="1389516957973" expanded="true"
> signature="625:1579" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/jaggery.conf">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="13" column="1" selection-start="344"
> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
> max-vertical-offset="285">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/config/console.json">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="21" column="26" selection-start="529"
> selection-end="529" vertical-scroll-proportion="-13.125"
> vertical-offset="0" max-vertical-offset="585">
> + <folding>
> + <marker date="1389783850689" expanded="true"
> signature="0:957" placeholder="{...}" />
> + <marker date="1389783850689" expanded="true"
> signature="499:528" placeholder="{"MGT": "/mgt"...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/themes/theme1/theme.js">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="0" column="0" selection-start="0" selection-end="0"
> vertical-scroll-proportion="0.0" vertical-offset="0"
> max-vertical-offset="551">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/util/utility.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="96" column="50" selection-start="2566"
> selection-end="2595" vertical-scroll-proportion="-18.208334"
> vertical-offset="1003" max-vertical-offset="2385">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry
> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="0" column="0" selection-start="0" selection-end="0"
> vertical-scroll-proportion="0.0" vertical-offset="0"
> max-vertical-offset="1185">
> + <folding>
> + <element signature="n#!!doc" expanded="true" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/index.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="4" column="30" selection-start="170"
> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
> max-vertical-offset="195">
> + <folding>
> + <marker date="1389333163237" expanded="true"
> signature="169:210" placeholder="{...}" />
> + </folding>
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/controllers/router.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="88" column="45" selection-start="2371"
> selection-end="2371" vertical-scroll-proportion="-17.5"
> vertical-offset="900" max-vertical-offset="1515">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/config/acl.json">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="9" column="22" selection-start="0"
> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
> max-vertical-offset="225">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + <entry file="file://$PROJECT_DIR$/util/acl.jag">
> + <provider selected="true" editor-type-id="text-editor">
> + <state line="74" column="86" selection-start="2685"
> selection-end="2714" vertical-scroll-proportion="0.686907"
> vertical-offset="748" max-vertical-offset="1275">
> + <folding />
> + </state>
> + </provider>
> + </entry>
> + </component>
> +</project>
> +
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/config_status.json
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/data/config_status.json
> b/components/org.apache.stratos.manager.console/console/data/config_status.json
> index 1c73caa..163aa03 100644
> ---
> a/components/org.apache.stratos.manager.console/console/data/config_status.json
> +++
> b/components/org.apache.stratos.manager.console/console/data/config_status.json
> @@ -1,4 +1,4 @@
> {
> "first_use":false,
> - "not_complete":true
> + "not_complete":false
> }
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/tenants.json
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/data/tenants.json
> b/components/org.apache.stratos.manager.console/console/data/tenants.json
> new file mode 100644
> index 0000000..11caa11
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/data/tenants.json
> @@ -0,0 +1,19 @@
> +[
> + {
> + "active":true,
> + "domain":"mysite.com",
> + "email":"admin@mysite.com",
> + "created":"16th Dec 13 - 23:55"
> + },{
> + "active":false,
> + "domain":"yoursite.com",
> + "email":"chanaka@yoursite.com",
> + "created":"15th Jan 14 - 13:45"
> + },{
> + "active":true,
> + "domain":"mysite2.com",
> + "email":"admin@mysite2.com",
> + "created":"16th Dec 13 - 23:55"
> + },
> +
> +]
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_management.jag
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/tenant_management.jag
> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
> new file mode 100644
> index 0000000..cfaa805
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
> @@ -0,0 +1,11 @@
> +<%
> +var caramel = require('caramel');
> +var tenants = require('data/tenants.json');
> +var config_status = require('/data/config_status.json');
> +var log = new Log();
> +log.info(tenants);
> +caramel.render({
> + tenants:tenants,
> + config_status:config_status
> +});
> +%>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_new.jag
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/tenant_new.jag
> b/components/org.apache.stratos.manager.console/console/tenant_new.jag
> new file mode 100644
> index 0000000..cfaa805
> --- /dev/null
> +++ b/components/org.apache.stratos.manager.console/console/tenant_new.jag
> @@ -0,0 +1,11 @@
> +<%
> +var caramel = require('caramel');
> +var tenants = require('data/tenants.json');
> +var config_status = require('/data/config_status.json');
> +var log = new Log();
> +log.info(tenants);
> +caramel.render({
> + tenants:tenants,
> + config_status:config_status
> +});
> +%>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
> new file mode 100644
> index 0000000..125d1a4
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
> @@ -0,0 +1,87 @@
> +<div class="container content-starter">
> + <div class="row">
> + <div class="col-lg-12">
> + <h1>Configure Stratos - {{title}}</h1>
> + </div>
> + </div>
> +</div>
> +<div class="container" id="addItemSection">
> + <div class="row">
> + <div class="col-md-12">
> + <form role="form">
> + <i class="icons-help icons-small-size"></i> Add
> at least one {{title}}.
> + <div style="clear: both"></div>
> + <label for="policy" class="required"
> style="margin-top:10px;">Policy Configuration</label>
> + <div class="container">
> + <div class="row">
> + <div class="col-md-6
> padding-remover-left">
> + <textarea class="form-control"
> rows="11" id="policy"></textarea>
> + <button data-step="{{step}}"
> type="button" class="btn btn-default" {{#unless wizard_on_2}}
> disabled="disabled" {{/unless}} id="wizardBack" id="wizardBack"><<
> Back</button>
> + <button data-step="{{step}}"
> type="button" class="btn {{#unless
> wizard_on_5}}btn-primary{{else}}btn-default{{/unless}}" id="wizardNext"
> {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button>
> + <button data-step="{{step}}"
> type="button" class="btn {{#if
> wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish"
> {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button>
> + </div>
> + <div class="col-md-6">
> + <i class="icons-help"></i>
> + Example configuration:
> + <pre>
> + {
> + "partition":{
> + "id": "P1",
> + "provider": "ec2",
> + "property": [
> + {
> + "name": "region",
> + "value": "ap-southeast-1"
> + }
> + ],
> + "partitionMin": "1",
> + "partitionMax": "3"
> + }
> + }
> + </pre>
> + </div>
> + </div>
> +
> + </div>
> +
> +
> + </form>
> +
> + </div>
> + </div>
> + </div>
> +
> +<div class="container">
> +
> + <div class="row">
> + <div class="col-md-12">
> +
> +
> + <div class="panel-group" id="accordion">
> +
> +
> + {{#each step_data}}
> + <div class="panel panel-default">
> + <div class="panel-heading">
> + <h4 class="panel-title">
> + <a data-toggle="collapse"
> data-parent="#accordion" href="#collapse{{key}}">
> + {{name}}
> + </a>
> + </h4>
> + </div>
> + <div id="collapse{{key}}" class="panel-collapse
> collapse">
> + <div class="panel-body">
> + <pre>{{policy}}</pre>
> + </div>
> + </div>
> + </div>
> + {{/each}}
> +
> +
> +
> + </div>
> + </div>
> + </div>
> +</div>
> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
> +<script src="{{url "/themes/theme1/ui/js/wizard.js"}}"></script>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
> index 673070f..3ad7353 100644
> ---
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
> @@ -19,13 +19,21 @@
> </div>
> <div class="col-lg-9 custom-nav">
> <ul class="pull-left">
> - <li {{#if dashboard}} class="active" {{/if}}><a
> href="{{url "/"}}"><i class="fa fa-dashboard"></i>
> <span><br>Dashboard</span></a></li>
> - <li {{#if partition_deployments}} class="active"
> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
> - <li {{#if tenant_mgt}} class="active" {{/if}}><a
> href="{{url "/"}}"><i class="fa fa-user"></i> <span><br>Tenant
> Mgt</span></a></li>
> - <li {{#if my_cartridges}} class="active"
> {{/if}}><a href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My
> Cartridges</span></a></li>
> + <!-- li {{#if dashboard}} class="active"
> {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i>
> <span><br>Dashboard</span></a></li -->
> + <li {{#if my_cartridges}} class="active"
> {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My
> Cartridges</span></a></li>
> + <li {{#if configure_stratos}} class="active"
> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
> + <li {{#if tenant_mgt}} class="active" {{/if}}><a
> href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i>
> <span><br>Tenant Mgt</span></a></li>
> </ul>
> <ul class="pull-right">
> - <li><a><i class="icon-user"></i><br> logout
> section</a></li>
> + <li class="dropdown">
> + <a href="#" class="dropdown-toggle"
> data-toggle="dropdown"><i class="fa fa-user"></i><br /> Username <b
> class="caret"></b></a>
> + <ul class="dropdown-menu">
> + <li><a><i class="fa fa-file-text-o"></i>
> View Profile</a></li>
> + <li>
> + <a><i class="fa fa-sign-out"></i>
> logout</a>
> + </li>
> + </ul>
> + </li>
> </ul>
> </div>
> </div>
> @@ -35,55 +43,164 @@
> <div class="breadcrumb-strip">
> <div class="container">
> <div class="row">
> -
> - <div class="col-lg-3">
> - <a class="btn {{button.class_name}}" href="{{url
> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
> - </div>
> - <div class="col-lg-9 help-section">
> - {{#if has_help}}
> - <i class="icons-help"></i>
> - <p>{{help}}</p>
> + {{#unless wizard_on}}
> + <div class="col-lg-3">
> + <a class="btn {{button.class_name}}" href="{{url
> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
> + </div>
> + {{#if has_action_buttons}}
> + <div class="col-lg-3">
> + <button class="btn btn-default"
> onclick="manage_selected('activate')" type="button">Activate</button>
> + <button class="btn btn-default"
> onclick="manage_selected('deactivate')">Deactivate</button>
> + <button class="btn btn-default"
> onclick="manage_selected('delete')">Delete</button>
> + </div>
> + <div class="col-lg-6 help-section">
> + {{#if has_help}}
> + <i class="icons-help"></i>
> + <p>{{help}}</p>
> + {{/if}}
> + </div>
> + {{else}}
> + <div class="col-lg-9 help-section">
> + {{#if has_help}}
> + <i class="icons-help"></i>
> + <p>{{help}}</p>
> + {{/if}}
> + {{#unless has_help}}
> + <ul class="sub-menu">
> + <li {{#if partition_deployments}}
> class="active" {{/if}}>
> + {{#if config_status.first_use}}
> + <span>Partition Deployments</span>
> + {{else}}
> + <a href="{{url
> "/partition_deployments.jag" }}">Partition Deployments</a>
> + {{/if}}
> + </li>
> + <li {{#if policy_deployments}}
> class="active" {{/if}}>
> + {{#if config_status.first_use}}
> + <span>Policy Deployments</span>
> + {{else}}
> + <a href="{{url
> "/policy_deployments.jag" }}">Policy Deployments</a>
> + {{/if}}
> + </li>
> + <li {{#if lbs}} class="active" {{/if}}>
> + {{#if config_status.first_use}}
> + <span>LBs</span>
> + {{else}}
> + <a href="{{url "/lbs.jag"
> }}">LBs</a>
> + {{/if}}
> + </li>
> + <li {{#if cartridge_deployments}}
> class="active" {{/if}}>
> + {{#if config_status.first_use}}
> + <span>Cartridge Deployments</span>
> + {{else}}
> + <a href="{{url
> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
> + {{/if}}
> + </li>
> + <li {{#if mt_service_deployments}}
> class="active" {{/if}}>
> + {{#if config_status.first_use}}
> + <span>Multi-Tenant Service
> Deployments</span>
> + {{else}}
> + <a href="{{url
> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
> + {{/if}}
> + </li>
> + </ul>
> + {{/unless}} <!-- hasHelp -->
> + </div>
> {{/if}}
> - {{#unless has_help}}
> - <ul class="sub-menu">
> - <li {{#if partition_deployments}} class="active"
> {{/if}}>
> - {{#if config_status.first_use}}
> - <span>Partition Deployments</span>
> - {{else}}
> - <a href="{{url
> "/partition_deployments.jag" }}">Partition Deployments</a>
> - {{/if}}
> + {{/unless}} <!-- wizardon -->
> +
> + {{#if wizard_on}}
> + <div class="col-lg-12">
> +
> + <ul class="sub-menu-wizard">
> + <li class="active">
> + <a href="{{url
> "/configure_stratos_wizard.jag?step=1" }}">
> + <div class="wizard-number">1</div>
> + <div>Partition Deployments</div>
> + </a>
> </li>
> - <li {{#if policy_deployments}} class="active"
> {{/if}}>
> - {{#if config_status.first_use}}
> - <span>Policy Deployments</span>
> - {{else}}
> - <a href="{{url "/policy_deployments.jag"
> }}">Policy Deployments</a>
> - {{/if}}
> + <li class="sub-menu-wizard-pointer active-pointer
> {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
> +
> +
> +
> + {{#if wizard_on_2}}
> + <li class="active">
> + <a href="{{url
> "/configure_stratos_wizard.jag?step=2" }}">
> + <div class="wizard-number">2</div>
> + <div>Policy Deployments</div>
> + </a>
> </li>
> - <li {{#if lbs}} class="active" {{/if}}>
> - {{#if config_status.first_use}}
> - <span>LBs</span>
> - {{else}}
> - <a href="{{url "/lbs.jag" }}">LBs</a>
> - {{/if}}
> + <li class="sub-menu-wizard-pointer active-pointer
> {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
> + {{else}}
> + <li>
> + <div class="in-active-wizard-item">
> + <div class="wizard-number">2</div>
> + <div>Policy Deployments</div>
> + </div>
> </li>
> - <li {{#if cartridge_deployments}} class="active"
> {{/if}}>
> - {{#if config_status.first_use}}
> - <span>Cartridge Deployments</span>
> - {{else}}
> - <a href="{{url
> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
> - {{/if}}
> + <li class="sub-menu-wizard-pointer"></li>
> + {{/if}}
> +
> +
> + {{#if wizard_on_3}}
> + <li class="active">
> + <a href="{{url
> "/configure_stratos_wizard.jag?step=3" }}">
> + <div class="wizard-number">3</div>
> + <div>LBs</div>
> + </a>
> </li>
> - <li {{#if mt_service_deployments}} class="active"
> {{/if}}>
> - {{#if config_status.first_use}}
> - <span>Multi-Tenant Service
> Deployments</span>
> - {{else}}
> - <a href="{{url
> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
> - {{/if}}
> + <li class="sub-menu-wizard-pointer active-pointer
> {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
> + {{else}}
> + <li>
> + <div class="in-active-wizard-item">
> + <div class="wizard-number">3</div>
> + <div>LBs</div>
> + </div>
> </li>
> + <li class="sub-menu-wizard-pointer"></li>
> + {{/if}}
> +
> +
> + {{#if wizard_on_4}}
> + <li class="active">
> + <a href="{{url
> "/configure_stratos_wizard.jag?step=4" }}">
> + <div class="wizard-number">4</div>
> + <div>Cartridge Deployments</div>
> + </a>
> + </li>
> + <li class="sub-menu-wizard-pointer active-pointer
> {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
> + {{else}}
> + <li>
> + <div class="in-active-wizard-item">
> + <div class="wizard-number">4</div>
> + <div>Cartridge Deployments</div>
> + </div>
> + </li>
> + <li class="sub-menu-wizard-pointer"></li>
> + {{/if}}
> +
> +
> + {{#if wizard_on_5}}
> + <li class="active">
> + <a href="{{url
> "/configure_stratos_wizard.jag?step=5" }}">
> + <div class="wizard-number">5</div>
> + <div>Multi-Tenant Service
> Deployments</div>
> + </a>
> + </li>
> + <li class="sub-menu-wizard-pointer active-pointer
> no-background"></li>
> + {{else}}
> + <li>
> + <div class="in-active-wizard-item">
> + <div class="wizard-number">5</div>
> + <div>Multi-Tenant Service
> Deployments</div>
> + </div>
> + </li>
> + <li class="sub-menu-wizard-pointer
> no-background"></li>
> + {{/if}}
> +
> </ul>
> - {{/unless}}
> +
> </div>
> + {{/if}}
> </div>
> </div>
> </div>
> @@ -102,4 +219,5 @@
> {{/if}}
> </div>
>
> -{{/unless}}
> \ No newline at end of file
> +{{/unless}}
> +
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
> index 0964be9..2e5d831 100644
> ---
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
> @@ -5,3 +5,33 @@
> </div>
> </div>
> </div>
> +{{#each cartridges}}
> +<div class="container">
> + <div class="row">
> + <div class="col-lg-12">
> + <div class="h2-wrapper"><h2>{{kind}}</h2></div>
> + </div>
> + </div>
> + <div class="row">
> + {{#each cartridges}}
> + <div class="col-md-6">
> + <div class="box-container">
> + <div class="container">
> + <div class="row">
> + <div class="col-lg-3">
> + <div class="box-left"><i
> class="icons-{{cartridgeType}} big-pro-icons"></i></div>
> + <div
> class="big-pro-icons-title">{{version}}</div>
> + </div>
> + <div class="col-lg-9">
> + <a href="{{url
> "/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a>
> + <div
> class="cartridge-description">{{description}}</div>
> +
> + </div>
> + </div>
> + </div>
> + </div>
> + </div>
> + {{/each}}
> + </div>
> +</div>
> +{{/each}}
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
> new file mode 100644
> index 0000000..ee1a41f
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
> @@ -0,0 +1,92 @@
> +<div class="container content-starter">
> + <div class="row">
> + <div class="col-lg-12">
> + <h1>{{title}}</h1>
> + </div>
> + </div>
> +</div>
> +<div class="container" style="display: none;" id="addItemSection">
> + <div class="row">
> + <div class="col-md-12">
> + <h2>Deploy New Partition</h2>
> + <form role="form">
> + <label for="policy" class="required">Partition
> Configuration</label>
> +
> + <div class="container">
> + <div class="row">
> + <div class="col-md-6
> padding-remover-left">
> + <textarea class="form-control"
> rows="11" id="policy"></textarea>
> + <button type="button" class="btn
> btn-primary" id="deployPolicy">Deploy Partition</button>
> + <a>Cancel</a>
> + </div>
> + <div class="col-md-6">
> + <i class="icons-help"></i>
> + Example configuration:
> + <pre>
> + {
> + "partition":{
> + "id": "P1",
> + "provider": "ec2",
> + "property": [
> + {
> + "name": "region",
> + "value": "ap-southeast-1"
> + }
> + ],
> + "partitionMin": "1",
> + "partitionMax": "3"
> + }
> + }
> + </pre>
> + </div>
> + </div>
> +
> + </div>
> +
> +
> + </form>
> +
> + </div>
> + </div>
> + </div>
> +
> +<div class="container">
> +
> + <div class="row">
> + <div class="col-md-12">
> + <div class="table-responsive">
> + <table class="table table-striped">
> + <thead>
> + <tr>
> + <th> <input type="checkbox"
> id="checkAll"/></th>
> + <th>State:</th>
> + <th>Domain:</th>
> + <th>Email:</th>
> + <th>
> + Created:
> + <div>DD Mon YY - HH:MM</div>
> + </th>
> + </tr>
> + </thead>
> + <tbody>
> + {{#each tenants}}
> + <tr>
> + <td><input value="{{domain}}" type="checkbox"
> {{#if active}}checked="checked"{{/if}} class="js_domainCheck" /></td>
> + <td><a title="Click to {{#if
> active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if
> active}}}deactivate{{else}}activate{{/if}}',this)"
> data-domain="{{domain}}"><i class="fa {{#if active}}}fa-check-circle-o
> green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td>
> + <td><a>{{domain}}</a></td>
> + <td>{{email}}</td>
> + <td>{{created}}</td>
> + </tr>
> + {{/each}}
> + </tbody>
> + </table>
> + </div>
> +
> +
> +
> +
> + </div>
> + </div>
> +</div>
> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
> +<script src="{{url
> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
> new file mode 100644
> index 0000000..aecd7a9
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
> @@ -0,0 +1,67 @@
> +<div class="container content-starter">
> + <div class="row">
> + <div class="col-lg-12">
> + <h1>{{title}}</h1>
> + </div>
> + </div>
> +</div>
> +<div class="container">
> +<div class="row">
> + <div class="col-md-12">
> + <form method="post" action="{{url "/tenant_management.jag" }}">
> + <div class="h2-wrapper"><h2>Domain Information</h2></div>
> + <label class="required">Domain:</label>
> + <div class="form-inline"><input type="text" placeholder="
> example.com"/> <button class="btn btn-default">Check
> Availability</button></div>
> + <label><input type="checkbox"/> Validate the domain now
> (Optional)</label>
> +
> + <div class="h2-wrapper"><h2>Usage Plan Information</h2></div>
> + <label class="required">Select usage plan:</label>
> + <select>
> + <option>Enterprise</option>
> + </select>
> + <a>More Info</a>
> +
> + <div class="h2-wrapper"><h2>Contact Details</h2></div>
> +
> + <div class="col-md-3 padding-remover-left">
> + <label class="required">First Name:</label>
> + <input type="text"/>
> + </div>
> + <div class="col-md-3">
> + <label class="required">Last Name:</label>
> + <input type="text"/>
> + </div>
> + <div class="clearfix"></div>
> + <label class="required">Admin User Name:</label>
> + <input type="text"/>
> + <div class="clearfix"></div>
> +
> + <div class="col-md-3 padding-remover-left">
> + <label class="required">Admin Password:</label>
> + <input type="text"/>
> + </div>
> + <div class="col-md-3">
> + <label class="required">Admin Password (Repeat):</label>
> + <input type="text"/>
> + </div>
> +
> + <div class="clearfix"></div>
> + <label class="required">Email:</label>
> + <input type="text"/>
> +
> + <label class="required">Are you human?</label>
> + <div style="padding-bottom:10px;"><i class="icons-help
> icons-small-size"></i> Type the characters you see in the picture
> below.</div>
> + <div class="clearfix"></div>
> + <input type="text"/>
> +
> + <div class="h2-wrapper"><h2>Terms of Use</h2></div>
> + <div class="terms-of-use">Lorem ipsum dolor sit amet,
> consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium,
> at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque.
> Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est,
> pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien.</div>
> + <label><input type="checkbox"/> I agree</label>
> +
> + <button class="btn btn-primary" type="submit">Add new
> Tenant</button>
> + </form>
> + </div>
> +</div>
> +</div>
> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
> +<script src="{{url
> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
> new file mode 100644
> index 0000000..c59751a
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
> @@ -0,0 +1,75 @@
> +var render = function (theme, data, meta, require) {
> + for(var i=0;i<data.step_data.length;i++){
> + data.step_data[i].key = data.step_data[i].name.replace(/ /g,'');
> + }
> + var title;
> + var wizard_on_val = [];
> + for(var i=0; i<5 ;i++){
> + if(i <= data.wizard.step-1){
> + wizard_on_val.push(true);
> + }else{
> + wizard_on_val.push(false);
> + }
> + }
> + var config_status = data.wizard;
> + if( config_status.step == 1 ){
> + title = 'Partition Deployment';
> + }else if( config_status.step == 2 ){
> + title = 'Policy Deployment';
> + }else if( config_status.step == 3 ){
> + title = 'Lb';
> + }else if( config_status.step == 4 ){
> + title = 'Cartridge Deployment';
> + }else if( config_status.step == 5 ){
> + title = 'Multi-Tenant Service Deployment';
> + }
> + theme('index', {
> + body: [
> + {
> + partial: 'configure_stratos_wizard',
> + context: {
> + title:title,
> + step_data:data.step_data,
> + step:config_status.step,
> + wizard_on_1:wizard_on_val[0],
> + wizard_on_2:wizard_on_val[1],
> + wizard_on_3:wizard_on_val[2],
> + wizard_on_4:wizard_on_val[3],
> + wizard_on_5:wizard_on_val[4]
> + }
> + }
> + ],
> + header: [
> + {
> + partial: 'header',
> + context:{
> + title:'Configure Stratos',
> + button:{
> + link:'/',
> + name:'Deploy New Cartridge',
> + class_name:''
> + },
> + has_help:false,
> + step_data:true,
> + config_status:data.config_status,
> + wizard_on:true,
> + wizard_on_1:wizard_on_val[0],
> + wizard_on_2:wizard_on_val[1],
> + wizard_on_3:wizard_on_val[2],
> + wizard_on_4:wizard_on_val[3],
> + wizard_on_5:wizard_on_val[4],
> + step:step,
> + configure_stratos:true
> + }
> + }
> + ],
> + title:[
> + {
> + partial:'title',
> + context:{
> + title:title
> + }
> + }
> + ]
> + });
> +};
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
> index 35c4375..37b30dc 100644
> ---
> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
> @@ -1,34 +1,38 @@
> var render = function (theme, data, meta, require) {
> - // Re-create the data structure of the cartridges.
> - /* var mycartridges = [
> - {
> - kind: "cartridges",
> - cartridges: []}
> - ];
> - var cartridgesToPush;
> - for(var i=0;i<data.mycartridges.length;i++){
> - if(data.mycartridges[i].category == undefined){
> - cartridgesToPush = null;
> - for(var j=0;j<mycartridges.length;j++){
> - if(mycartridges[j].kind == "cartridges" ){
> - cartridgesToPush = mycartridges[j].cartridges;
> - }
> - }
> - cartridgesToPush.push(data.mycartridges[i]);
> - }else{
> - cartridgesToPush = null;
> - for (var j = 0; j < mycartridges.length; j++) {
> - if (mycartridges[j].kind == data.mycartridges[i].category) {
> - cartridgesToPush = mycartridges[j].cartridges;
> - }
> - }
> - if(cartridgesToPush == null){
> -
> mycartridges.push({kind:data.mycartridges[i].category,cartridges:[data.mycartridges[i]]})
> - }else{
> - cartridgesToPush.push(data.mycartridges[i]);
> - }
> - }
> - }*/
> + // Re-create the data structure of the cartridges.
> + var log = new Log();
> + var cartridges_old = data.mycartridges.cartridge;
> + var cartridges_new = [
> + {
> + kind: "Cartridges",
> + cartridges: []}
> + ];
> + var cartridgesToPush;
> + for (var i = 0; i < cartridges_old.length; i++) {
> + if (cartridges_old[i].category == undefined) {
> + cartridgesToPush = null;
> + for (var j = 0; j < cartridges_new.length; j++) {
> + if (cartridges_new[j].kind == "Cartridges") {
> + cartridgesToPush = cartridges_new[j].cartridges;
> + }
> + }
> + cartridgesToPush.push(cartridges_old[i]);
> + log.info(cartridges_old[i]);
> + } else {
> + cartridgesToPush = null;
> + for (var j = 0; j < cartridges_new.length; j++) {
> + if (cartridges_new[j].kind == cartridges_old[i].category)
> {
> + cartridgesToPush = cartridges_new[j].cartridges;
> + }
> + }
> + if (cartridgesToPush == null) {
> + cartridges_new.push({kind: cartridges_old[i].category,
> cartridges: [cartridges_old[i]]})
> + } else {
> + cartridgesToPush.push(cartridges_old[i]);
> + }
> + }
> + }
> + log.info(cartridges_new);
>
> theme('index', {
> body: [
> @@ -36,7 +40,7 @@ var render = function (theme, data, meta, require) {
> partial: 'mycartridges',
> context: {
> title: 'My Cartridges',
> - mycartridges: {}
> + mycartridges: cartridges_new
> }
> }
> ],
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
> new file mode 100644
> index 0000000..8b676ab
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
> @@ -0,0 +1,42 @@
> +var render = function (theme, data, meta, require) {
> +
> + var create_btn_class = 'btn-important';
> + var title = 'Tenant Management';
> + theme('index', {
> + body: [
> + {
> + partial: 'tenant_management',
> + context: {
> + title:title,
> + tenants:data.tenants
> + }
> + }
> + ],
> + header: [
> + {
> + partial: 'header',
> + context:{
> + title:'Tenant Management',
> + button:{
> + link:'/tenant_new.jag',
> + name:'Add New Tenant',
> + class_name:create_btn_class
> + },
> + has_help:true,
> + help:"Tenants you create has permission to view and
> subscribe to Cartridges. Tenants don't have permission to do Partition
> deployment, Policy deployment, LB Creation, and MT service deployment.",
> + tenant_mgt:true,
> + config_status:data.config_status,
> + has_action_buttons:true
> + }
> + }
> + ],
> + title:[
> + {
> + partial:'title',
> + context:{
> + title:title
> + }
> + }
> + ]
> + });
> +};
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
> ----------------------------------------------------------------------
> diff --git
> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
> new file mode 100644
> index 0000000..3ae7026
> --- /dev/null
> +++
> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
> @@ -0,0 +1,42 @@
> +var render = function (theme, data, meta, require) {
> +
> + var create_btn_class = 'btn-default';
> + var title = 'Tenant Management - Add New Tenant';
> + theme('index', {
> + body: [
> + {
> + partial: 'tenant_new',
> + context: {
> + title:title,
> + tenants:data.tenants
> + }
> + }
> + ],
> + header: [
> + {
> + partial: 'header',
> + context:{
> + title:title,
> + button:{
> + link:'/tenant_management.jag',
> + name:'Tenant Management',
> + class_name:create_btn_class,
> + class_icon:'fa fa-arrow-left'
> + },
> + has_help:true,
> + help:"Tenants you create has permission to view and
> subscribe to Cartridges. Tenants don't have permission to do Partition
> deployment, Policy deployment, LB Creation, and MT service deployment.",
> + tenant_mgt:true,
> + config_status:data.config_status
> + }
> + }
> + ],
> + title:[
> + {
> + partial:'title',
> + context:{
> + title:title
> + }
> + }
> + ]
> + });
> +};
> \ No newline at end of file
>
>
--
Best Regards,
Nirmal
Nirmal Fernando.
PPMC Member & Committer of Apache Stratos,
Senior Software Engineer, WSO2 Inc.
Blog: http://nirmalfdo.blogspot.com/
[3/4] git commit: commiting changes provided by Chanaka Jayasena,
STRATOS-359
Posted by pr...@apache.org.
commiting changes provided by Chanaka Jayasena, STRATOS-359
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f3a94af9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f3a94af9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f3a94af9
Branch: refs/heads/master
Commit: f3a94af9cf408a3929f28446f15ab5d75e0923a3
Parents: 47f406d
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Jan 16 15:03:39 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Jan 16 15:03:39 2014 +0530
----------------------------------------------------------------------
.../console/configure_stratos_wizard.jag | 28 +
.../console/console.ipr | 59 +
.../console/console.iws | 719 ++++++
.../console/data/config_status.json | 2 +-
.../console/data/tenants.json | 19 +
.../console/tenant_management.jag | 11 +
.../console/tenant_new.jag | 11 +
.../partials/configure_stratos_wizard.hbs | 87 +
.../console/themes/theme1/partials/header.hbs | 212 +-
.../themes/theme1/partials/mycartridges.hbs | 30 +
.../theme1/partials/tenant_management.hbs | 92 +
.../themes/theme1/partials/tenant_new.hbs | 67 +
.../renderers/configure_stratos_wizard.js | 75 +
.../console/themes/theme1/renderers/index.js | 66 +-
.../theme1/renderers/tenant_management.js | 42 +
.../themes/theme1/renderers/tenant_new.js | 42 +
.../console/themes/theme1/theme.js | 37 +-
.../console/themes/theme1/ui/css/bootstrap.css | 2337 ++++++++++--------
.../console/themes/theme1/ui/css/main.css | 116 +-
.../themes/theme1/ui/js/tenant_management.js | 30 +
.../console/themes/theme1/ui/js/wizard.js | 18 +
21 files changed, 3007 insertions(+), 1093 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
new file mode 100644
index 0000000..a4e7730
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
@@ -0,0 +1,28 @@
+<%
+var caramel = require('caramel');
+var step = request.getParameter('step');
+if(step == null){
+ step = 1;
+}
+
+var step_data = {};
+
+var wizard = {
+ "step":step
+}
+if(wizard.step == 1){
+ step_data = require('data/partition_deployments.json');
+}else if(wizard.step == 2){
+ step_data = require('data/policy_deployments.json');
+}else if(wizard.step == 3){
+ step_data = require('data/lbs.json');
+}else if(wizard.step == 4){
+ step_data = require('data/cartridge_deployments.json');
+}else if(wizard.step == 5){
+ step_data = require('data/mt_service_deployments.json');
+}
+caramel.render({
+ step_data:step_data,
+ wizard:wizard
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.ipr
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/console.ipr b/components/org.apache.stratos.manager.console/console/console.ipr
new file mode 100644
index 0000000..e157c0c
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/console.ipr
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ <entry name="?*.ftl" />
+ </wildcardResourcePatterns>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
+ </component>
+ <component name="CopyrightManager" default="">
+ <module2copyright />
+ </component>
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/console.iml" filepath="$PROJECT_DIR$/console.iml" />
+ </modules>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <last-edited>1.6</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.iws
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/console.iws b/components/org.apache.stratos.manager.console/console/console.iws
new file mode 100644
index 0000000..d75ecf7
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/console.iws
@@ -0,0 +1,719 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="2a216222-994f-4b4b-8241-afb5024e6741" name="Default" comment="" />
+ <ignored path="console.iws" />
+ <ignored path=".idea/workspace.xml" />
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+ <component name="CreatePatchCommitExecutor">
+ <option name="PATCH_PATH" value="" />
+ </component>
+ <component name="DaemonCodeAnalyzer">
+ <disable_hints />
+ </component>
+ <component name="DebuggerManager">
+ <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="SUSPEND" value="true" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="true" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="REMOVE_AFTER_HIT" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="SUSPEND" value="true" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="true" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </breakpoint_any>
+ <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
+ <breakpoint_rules />
+ <ui_properties />
+ </component>
+ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+ <component name="FavoritesManager">
+ <favorites_list name="console" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf>
+ <file leaf-file-name="utility.jag" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/util/utility.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="96" column="50" selection-start="2566" selection-end="2595" vertical-scroll-proportion="-18.208334" vertical-offset="1003" max-vertical-offset="2385">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="acl.jag" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/util/acl.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="74" column="86" selection-start="2685" selection-end="2714" vertical-scroll-proportion="0.686907" vertical-offset="748" max-vertical-offset="1275">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="security.manager.js" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/modules/security/security.manager.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="634" max-vertical-offset="1185">
+ <folding>
+ <element signature="n#!!doc" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="acs.jag" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="41" column="103" selection-start="2059" selection-end="2059" vertical-scroll-proportion="-14.375" vertical-offset="270" max-vertical-offset="1530">
+ <folding>
+ <marker date="1389674842353" expanded="true" signature="16:4412" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="550:818" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="997:1105" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1137:3910" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1314:3804" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1422:3793" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1503:3779" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="2686:3761" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="3505:3738" placeholder="//..." />
+ <marker date="1389674842353" expanded="true" signature="3810:3904" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="4011:4410" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="acl.json" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/acl.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="22" selection-start="0" selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0" max-vertical-offset="225">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="router.jag" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/controllers/router.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="88" column="45" selection-start="2371" selection-end="2371" vertical-scroll-proportion="-17.5" vertical-offset="900" max-vertical-offset="1515">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="index.jag" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/index.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="4" column="30" selection-start="170" selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="195">
+ <folding>
+ <marker date="1389333163237" expanded="true" signature="169:210" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="jaggery.conf" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/jaggery.conf">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="13" column="1" selection-start="344" selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="login.jag" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/controllers/login.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="67" selection-start="555" selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="630">
+ <folding>
+ <marker date="1389516957973" expanded="true" signature="14:1581" placeholder="{...}" />
+ <marker date="1389516957973" expanded="true" signature="625:1579" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="console.json" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/config/console.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="26" selection-start="529" selection-end="529" vertical-scroll-proportion="-13.125" vertical-offset="0" max-vertical-offset="585">
+ <folding>
+ <marker date="1389783850689" expanded="true" signature="0:957" placeholder="{...}" />
+ <marker date="1389783850689" expanded="true" signature="499:528" placeholder="{"MGT": "/mgt"...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FindManager">
+ <FindUsagesManager>
+ <setting name="OPEN_NEW_TAB" value="false" />
+ </FindUsagesManager>
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="changedFiles">
+ <list>
+ <option value="$PROJECT_DIR$/cartridges.jag" />
+ <option value="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" />
+ <option value="$PROJECT_DIR$/util/utility.jag" />
+ <option value="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" />
+ <option value="$PROJECT_DIR$/README.md" />
+ <option value="$PROJECT_DIR$/controllers/login.jag" />
+ <option value="$PROJECT_DIR$/util/authUtils.jag" />
+ <option value="$PROJECT_DIR$/controllers/acs.jag" />
+ <option value="$PROJECT_DIR$/jaggery.conf" />
+ <option value="$PROJECT_DIR$/config/console.json" />
+ <option value="$PROJECT_DIR$/index.jag" />
+ <option value="$PROJECT_DIR$/config/acl.json" />
+ <option value="$PROJECT_DIR$/util/acl.jag" />
+ <option value="$PROJECT_DIR$/controllers/router.jag" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="y" value="24" />
+ <option name="width" value="1366" />
+ <option name="height" value="720" />
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectReloadState">
+ <option name="STATE" value="0" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ </navigator>
+ <panes>
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="util" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="theme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="theme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="partials" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="modules" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="security" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="controllers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="console" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="config" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="GoToFile.includeJavaFiles" value="false" />
+ <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="LayoutCode.rearrangeEntriesHTML" value="false" />
+ <property name="LayoutCode.rearrangeEntriesPlain text" value="false" />
+ <property name="LayoutCode.rearrangeEntriesJSON" value="false" />
+ </component>
+ <component name="RunManager">
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ <method />
+ </configuration>
+ <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
+ <method />
+ </configuration>
+ <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" output_log_level="null" package_name="" scope="Class">
+ <option name="BCName" value="" />
+ <option name="launcherParameters">
+ <LauncherParameters>
+ <option name="browserFamily" value="FIREFOX" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
+ </LauncherParameters>
+ </option>
+ <option name="moduleName" value="" />
+ <option name="trusted" value="true" />
+ <method />
+ </configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <method />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="moduleWithDependencies" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
+ <option name="BCName" value="" />
+ <option name="IOSSimulatorSdkPath" value="" />
+ <option name="adlOptions" value="" />
+ <option name="airProgramParameters" value="" />
+ <option name="appDescriptorForEmulator" value="Android" />
+ <option name="debugTransport" value="USB" />
+ <option name="debuggerSdkRaw" value="BC SDK" />
+ <option name="emulator" value="NexusOne" />
+ <option name="emulatorAdlOptions" value="" />
+ <option name="fastPackaging" value="true" />
+ <option name="fullScreenHeight" value="0" />
+ <option name="fullScreenWidth" value="0" />
+ <option name="launchUrl" value="false" />
+ <option name="launcherParameters">
+ <LauncherParameters>
+ <option name="browserFamily" value="FIREFOX" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="/usr/bin/flashplayerdebugger" />
+ </LauncherParameters>
+ </option>
+ <option name="mobileRunTarget" value="Emulator" />
+ <option name="moduleName" value="" />
+ <option name="overriddenMainClass" value="" />
+ <option name="overriddenOutputFileName" value="" />
+ <option name="overrideMainClass" value="false" />
+ <option name="runTrusted" value="true" />
+ <option name="screenDpi" value="0" />
+ <option name="screenHeight" value="0" />
+ <option name="screenWidth" value="0" />
+ <option name="url" value="http://" />
+ <option name="usbDebugPort" value="7936" />
+ <method />
+ </configuration>
+ <list size="0" />
+ <configuration name="<template>" type="WebApp" default="true" selected="false">
+ <Host>localhost</Host>
+ <Port>5050</Port>
+ </configuration>
+ </component>
+ <component name="ShelveChangesManager" show_recycled="false" />
+ <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="mySSHConnectionTimeout" value="30000" />
+ <option name="mySSHReadTimeout" value="30000" />
+ <option name="LAST_MERGED_REVISION" />
+ <option name="MERGE_DRY_RUN" value="false" />
+ <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+ <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+ <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+ <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+ <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+ <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+ <option name="FORCE_UPDATE" value="false" />
+ <option name="IGNORE_EXTERNALS" value="false" />
+ <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="24" width="1366" height="720" extended-state="1" />
+ <editor active="true" />
+ <layout>
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24962178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ </layout>
+ </component>
+ <component name="UnknownFeatures">
+ <option featureType="com.intellij.fileTypeFactory" implementationName="*.conf" />
+ </component>
+ <component name="Vcs.Log.UiProperties">
+ <option name="RECENTLY_FILTERED_USERS">
+ <collection />
+ </option>
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="myTodoPanelSettings">
+ <TodoPanelSettings />
+ </option>
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/cartridges.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="7" column="2" selection-start="245" selection-end="245" vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="195">
+ <folding>
+ <marker date="1389332136797" expanded="true" signature="-1:-1" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="6" column="5" selection-start="248" selection-end="248" vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="195">
+ <folding>
+ <marker date="1389355612584" expanded="true" signature="-1:-1" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="43" selection-start="1032" selection-end="1032" vertical-scroll-proportion="-11.875" vertical-offset="45" max-vertical-offset="1470">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
+ <state />
+ </provider>
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="0" selection-start="292" selection-end="292" vertical-scroll-proportion="-3.235294" vertical-offset="0" max-vertical-offset="255">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="41" column="103" selection-start="2059" selection-end="2059" vertical-scroll-proportion="-14.375" vertical-offset="270" max-vertical-offset="1530">
+ <folding>
+ <marker date="1389674842353" expanded="true" signature="16:4412" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="550:818" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="997:1105" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1137:3910" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1314:3804" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1422:3793" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="1503:3779" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="2686:3761" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="3505:3738" placeholder="//..." />
+ <marker date="1389674842353" expanded="true" signature="3810:3904" placeholder="{...}" />
+ <marker date="1389674842353" expanded="true" signature="4011:4410" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/controllers/login.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="67" selection-start="555" selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="630">
+ <folding>
+ <marker date="1389516957973" expanded="true" signature="14:1581" placeholder="{...}" />
+ <marker date="1389516957973" expanded="true" signature="625:1579" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/jaggery.conf">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="13" column="1" selection-start="344" selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/console.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="26" selection-start="529" selection-end="529" vertical-scroll-proportion="-13.125" vertical-offset="0" max-vertical-offset="585">
+ <folding>
+ <marker date="1389783850689" expanded="true" signature="0:957" placeholder="{...}" />
+ <marker date="1389783850689" expanded="true" signature="499:528" placeholder="{"MGT": "/mgt"...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/themes/theme1/theme.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="551">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/util/utility.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="96" column="50" selection-start="2566" selection-end="2595" vertical-scroll-proportion="-18.208334" vertical-offset="1003" max-vertical-offset="2385">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/modules/security/security.manager.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
+ <folding>
+ <element signature="n#!!doc" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/index.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="4" column="30" selection-start="170" selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="195">
+ <folding>
+ <marker date="1389333163237" expanded="true" signature="169:210" placeholder="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/controllers/router.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="88" column="45" selection-start="2371" selection-end="2371" vertical-scroll-proportion="-17.5" vertical-offset="900" max-vertical-offset="1515">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/config/acl.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="22" selection-start="0" selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0" max-vertical-offset="225">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/util/acl.jag">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="74" column="86" selection-start="2685" selection-end="2714" vertical-scroll-proportion="0.686907" vertical-offset="748" max-vertical-offset="1275">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </component>
+</project>
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/config_status.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/data/config_status.json b/components/org.apache.stratos.manager.console/console/data/config_status.json
index 1c73caa..163aa03 100644
--- a/components/org.apache.stratos.manager.console/console/data/config_status.json
+++ b/components/org.apache.stratos.manager.console/console/data/config_status.json
@@ -1,4 +1,4 @@
{
"first_use":false,
- "not_complete":true
+ "not_complete":false
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/tenants.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/data/tenants.json b/components/org.apache.stratos.manager.console/console/data/tenants.json
new file mode 100644
index 0000000..11caa11
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/data/tenants.json
@@ -0,0 +1,19 @@
+[
+ {
+ "active":true,
+ "domain":"mysite.com",
+ "email":"admin@mysite.com",
+ "created":"16th Dec 13 - 23:55"
+ },{
+ "active":false,
+ "domain":"yoursite.com",
+ "email":"chanaka@yoursite.com",
+ "created":"15th Jan 14 - 13:45"
+ },{
+ "active":true,
+ "domain":"mysite2.com",
+ "email":"admin@mysite2.com",
+ "created":"16th Dec 13 - 23:55"
+ },
+
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_management.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/tenant_management.jag b/components/org.apache.stratos.manager.console/console/tenant_management.jag
new file mode 100644
index 0000000..cfaa805
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/tenant_management.jag
@@ -0,0 +1,11 @@
+<%
+var caramel = require('caramel');
+var tenants = require('data/tenants.json');
+var config_status = require('/data/config_status.json');
+var log = new Log();
+log.info(tenants);
+caramel.render({
+ tenants:tenants,
+ config_status:config_status
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_new.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/tenant_new.jag b/components/org.apache.stratos.manager.console/console/tenant_new.jag
new file mode 100644
index 0000000..cfaa805
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/tenant_new.jag
@@ -0,0 +1,11 @@
+<%
+var caramel = require('caramel');
+var tenants = require('data/tenants.json');
+var config_status = require('/data/config_status.json');
+var log = new Log();
+log.info(tenants);
+caramel.render({
+ tenants:tenants,
+ config_status:config_status
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
new file mode 100644
index 0000000..125d1a4
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
@@ -0,0 +1,87 @@
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>Configure Stratos - {{title}}</h1>
+ </div>
+ </div>
+</div>
+<div class="container" id="addItemSection">
+ <div class="row">
+ <div class="col-md-12">
+ <form role="form">
+ <i class="icons-help icons-small-size"></i> Add at least one {{title}}.
+ <div style="clear: both"></div>
+ <label for="policy" class="required" style="margin-top:10px;">Policy Configuration</label>
+ <div class="container">
+ <div class="row">
+ <div class="col-md-6 padding-remover-left">
+ <textarea class="form-control" rows="11" id="policy"></textarea>
+ <button data-step="{{step}}" type="button" class="btn btn-default" {{#unless wizard_on_2}} disabled="disabled" {{/unless}} id="wizardBack" id="wizardBack"><< Back</button>
+ <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_5}}btn-primary{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button>
+ <button data-step="{{step}}" type="button" class="btn {{#if wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish" {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button>
+ </div>
+ <div class="col-md-6">
+ <i class="icons-help"></i>
+ Example configuration:
+ <pre>
+ {
+ "partition":{
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ }
+ ],
+ "partitionMin": "1",
+ "partitionMax": "3"
+ }
+ }
+ </pre>
+ </div>
+ </div>
+
+ </div>
+
+
+ </form>
+
+ </div>
+ </div>
+ </div>
+
+<div class="container">
+
+ <div class="row">
+ <div class="col-md-12">
+
+
+ <div class="panel-group" id="accordion">
+
+
+ {{#each step_data}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}">
+ {{name}}
+ </a>
+ </h4>
+ </div>
+ <div id="collapse{{key}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <pre>{{policy}}</pre>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+
+
+
+ </div>
+ </div>
+ </div>
+</div>
+<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/wizard.js"}}"></script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
index 673070f..3ad7353 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
@@ -19,13 +19,21 @@
</div>
<div class="col-lg-9 custom-nav">
<ul class="pull-left">
- <li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li>
- <li {{#if partition_deployments}} class="active" {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
- <li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>
- <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My Cartridges</span></a></li>
+ <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
+ <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i> <span><br>My Cartridges</span></a></li>
+ <li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
+ <li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>
</ul>
<ul class="pull-right">
- <li><a><i class="icon-user"></i><br> logout section</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> Username <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a><i class="fa fa-file-text-o"></i> View Profile</a></li>
+ <li>
+ <a><i class="fa fa-sign-out"></i> logout</a>
+ </li>
+ </ul>
+ </li>
</ul>
</div>
</div>
@@ -35,55 +43,164 @@
<div class="breadcrumb-strip">
<div class="container">
<div class="row">
-
- <div class="col-lg-3">
- <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
- </div>
- <div class="col-lg-9 help-section">
- {{#if has_help}}
- <i class="icons-help"></i>
- <p>{{help}}</p>
+ {{#unless wizard_on}}
+ <div class="col-lg-3">
+ <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
+ </div>
+ {{#if has_action_buttons}}
+ <div class="col-lg-3">
+ <button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
+ <button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
+ <button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>
+ </div>
+ <div class="col-lg-6 help-section">
+ {{#if has_help}}
+ <i class="icons-help"></i>
+ <p>{{help}}</p>
+ {{/if}}
+ </div>
+ {{else}}
+ <div class="col-lg-9 help-section">
+ {{#if has_help}}
+ <i class="icons-help"></i>
+ <p>{{help}}</p>
+ {{/if}}
+ {{#unless has_help}}
+ <ul class="sub-menu">
+ <li {{#if partition_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Partition Deployments</span>
+ {{else}}
+ <a href="{{url "/partition_deployments.jag" }}">Partition Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if policy_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Policy Deployments</span>
+ {{else}}
+ <a href="{{url "/policy_deployments.jag" }}">Policy Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if lbs}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>LBs</span>
+ {{else}}
+ <a href="{{url "/lbs.jag" }}">LBs</a>
+ {{/if}}
+ </li>
+ <li {{#if cartridge_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Cartridge Deployments</span>
+ {{else}}
+ <a href="{{url "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if mt_service_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Multi-Tenant Service Deployments</span>
+ {{else}}
+ <a href="{{url "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
+ {{/if}}
+ </li>
+ </ul>
+ {{/unless}} <!-- hasHelp -->
+ </div>
{{/if}}
- {{#unless has_help}}
- <ul class="sub-menu">
- <li {{#if partition_deployments}} class="active" {{/if}}>
- {{#if config_status.first_use}}
- <span>Partition Deployments</span>
- {{else}}
- <a href="{{url "/partition_deployments.jag" }}">Partition Deployments</a>
- {{/if}}
+ {{/unless}} <!-- wizardon -->
+
+ {{#if wizard_on}}
+ <div class="col-lg-12">
+
+ <ul class="sub-menu-wizard">
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=1" }}">
+ <div class="wizard-number">1</div>
+ <div>Partition Deployments</div>
+ </a>
</li>
- <li {{#if policy_deployments}} class="active" {{/if}}>
- {{#if config_status.first_use}}
- <span>Policy Deployments</span>
- {{else}}
- <a href="{{url "/policy_deployments.jag" }}">Policy Deployments</a>
- {{/if}}
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
+
+
+
+ {{#if wizard_on_2}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=2" }}">
+ <div class="wizard-number">2</div>
+ <div>Policy Deployments</div>
+ </a>
</li>
- <li {{#if lbs}} class="active" {{/if}}>
- {{#if config_status.first_use}}
- <span>LBs</span>
- {{else}}
- <a href="{{url "/lbs.jag" }}">LBs</a>
- {{/if}}
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">2</div>
+ <div>Policy Deployments</div>
+ </div>
</li>
- <li {{#if cartridge_deployments}} class="active" {{/if}}>
- {{#if config_status.first_use}}
- <span>Cartridge Deployments</span>
- {{else}}
- <a href="{{url "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
- {{/if}}
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_3}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=3" }}">
+ <div class="wizard-number">3</div>
+ <div>LBs</div>
+ </a>
</li>
- <li {{#if mt_service_deployments}} class="active" {{/if}}>
- {{#if config_status.first_use}}
- <span>Multi-Tenant Service Deployments</span>
- {{else}}
- <a href="{{url "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
- {{/if}}
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">3</div>
+ <div>LBs</div>
+ </div>
</li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_4}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=4" }}">
+ <div class="wizard-number">4</div>
+ <div>Cartridge Deployments</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">4</div>
+ <div>Cartridge Deployments</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer"></li>
+ {{/if}}
+
+
+ {{#if wizard_on_5}}
+ <li class="active">
+ <a href="{{url "/configure_stratos_wizard.jag?step=5" }}">
+ <div class="wizard-number">5</div>
+ <div>Multi-Tenant Service Deployments</div>
+ </a>
+ </li>
+ <li class="sub-menu-wizard-pointer active-pointer no-background"></li>
+ {{else}}
+ <li>
+ <div class="in-active-wizard-item">
+ <div class="wizard-number">5</div>
+ <div>Multi-Tenant Service Deployments</div>
+ </div>
+ </li>
+ <li class="sub-menu-wizard-pointer no-background"></li>
+ {{/if}}
+
</ul>
- {{/unless}}
+
</div>
+ {{/if}}
</div>
</div>
</div>
@@ -102,4 +219,5 @@
{{/if}}
</div>
-{{/unless}}
\ No newline at end of file
+{{/unless}}
+
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
index 0964be9..2e5d831 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
@@ -5,3 +5,33 @@
</div>
</div>
</div>
+{{#each cartridges}}
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="h2-wrapper"><h2>{{kind}}</h2></div>
+ </div>
+ </div>
+ <div class="row">
+ {{#each cartridges}}
+ <div class="col-md-6">
+ <div class="box-container">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-3">
+ <div class="box-left"><i class="icons-{{cartridgeType}} big-pro-icons"></i></div>
+ <div class="big-pro-icons-title">{{version}}</div>
+ </div>
+ <div class="col-lg-9">
+ <a href="{{url "/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a>
+ <div class="cartridge-description">{{description}}</div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+ </div>
+</div>
+{{/each}}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
new file mode 100644
index 0000000..ee1a41f
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
@@ -0,0 +1,92 @@
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+<div class="container" style="display: none;" id="addItemSection">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Deploy New Partition</h2>
+ <form role="form">
+ <label for="policy" class="required">Partition Configuration</label>
+
+ <div class="container">
+ <div class="row">
+ <div class="col-md-6 padding-remover-left">
+ <textarea class="form-control" rows="11" id="policy"></textarea>
+ <button type="button" class="btn btn-primary" id="deployPolicy">Deploy Partition</button>
+ <a>Cancel</a>
+ </div>
+ <div class="col-md-6">
+ <i class="icons-help"></i>
+ Example configuration:
+ <pre>
+ {
+ "partition":{
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ }
+ ],
+ "partitionMin": "1",
+ "partitionMax": "3"
+ }
+ }
+ </pre>
+ </div>
+ </div>
+
+ </div>
+
+
+ </form>
+
+ </div>
+ </div>
+ </div>
+
+<div class="container">
+
+ <div class="row">
+ <div class="col-md-12">
+ <div class="table-responsive">
+ <table class="table table-striped">
+ <thead>
+ <tr>
+ <th> <input type="checkbox" id="checkAll"/></th>
+ <th>State:</th>
+ <th>Domain:</th>
+ <th>Email:</th>
+ <th>
+ Created:
+ <div>DD Mon YY - HH:MM</div>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#each tenants}}
+ <tr>
+ <td><input value="{{domain}}" type="checkbox" {{#if active}}checked="checked"{{/if}} class="js_domainCheck" /></td>
+ <td><a title="Click to {{#if active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if active}}}deactivate{{else}}activate{{/if}}',this)" data-domain="{{domain}}"><i class="fa {{#if active}}}fa-check-circle-o green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td>
+ <td><a>{{domain}}</a></td>
+ <td>{{email}}</td>
+ <td>{{created}}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ </div>
+
+
+
+
+ </div>
+ </div>
+</div>
+<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
new file mode 100644
index 0000000..aecd7a9
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
@@ -0,0 +1,67 @@
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+<div class="container">
+<div class="row">
+ <div class="col-md-12">
+ <form method="post" action="{{url "/tenant_management.jag" }}">
+ <div class="h2-wrapper"><h2>Domain Information</h2></div>
+ <label class="required">Domain:</label>
+ <div class="form-inline"><input type="text" placeholder="example.com"/> <button class="btn btn-default">Check Availability</button></div>
+ <label><input type="checkbox"/> Validate the domain now (Optional)</label>
+
+ <div class="h2-wrapper"><h2>Usage Plan Information</h2></div>
+ <label class="required">Select usage plan:</label>
+ <select>
+ <option>Enterprise</option>
+ </select>
+ <a>More Info</a>
+
+ <div class="h2-wrapper"><h2>Contact Details</h2></div>
+
+ <div class="col-md-3 padding-remover-left">
+ <label class="required">First Name:</label>
+ <input type="text"/>
+ </div>
+ <div class="col-md-3">
+ <label class="required">Last Name:</label>
+ <input type="text"/>
+ </div>
+ <div class="clearfix"></div>
+ <label class="required">Admin User Name:</label>
+ <input type="text"/>
+ <div class="clearfix"></div>
+
+ <div class="col-md-3 padding-remover-left">
+ <label class="required">Admin Password:</label>
+ <input type="text"/>
+ </div>
+ <div class="col-md-3">
+ <label class="required">Admin Password (Repeat):</label>
+ <input type="text"/>
+ </div>
+
+ <div class="clearfix"></div>
+ <label class="required">Email:</label>
+ <input type="text"/>
+
+ <label class="required">Are you human?</label>
+ <div style="padding-bottom:10px;"><i class="icons-help icons-small-size"></i> Type the characters you see in the picture below.</div>
+ <div class="clearfix"></div>
+ <input type="text"/>
+
+ <div class="h2-wrapper"><h2>Terms of Use</h2></div>
+ <div class="terms-of-use">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien.</div>
+ <label><input type="checkbox"/> I agree</label>
+
+ <button class="btn btn-primary" type="submit">Add new Tenant</button>
+ </form>
+ </div>
+</div>
+</div>
+<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
new file mode 100644
index 0000000..c59751a
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
@@ -0,0 +1,75 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.step_data.length;i++){
+ data.step_data[i].key = data.step_data[i].name.replace(/ /g,'');
+ }
+ var title;
+ var wizard_on_val = [];
+ for(var i=0; i<5 ;i++){
+ if(i <= data.wizard.step-1){
+ wizard_on_val.push(true);
+ }else{
+ wizard_on_val.push(false);
+ }
+ }
+ var config_status = data.wizard;
+ if( config_status.step == 1 ){
+ title = 'Partition Deployment';
+ }else if( config_status.step == 2 ){
+ title = 'Policy Deployment';
+ }else if( config_status.step == 3 ){
+ title = 'Lb';
+ }else if( config_status.step == 4 ){
+ title = 'Cartridge Deployment';
+ }else if( config_status.step == 5 ){
+ title = 'Multi-Tenant Service Deployment';
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'configure_stratos_wizard',
+ context: {
+ title:title,
+ step_data:data.step_data,
+ step:config_status.step,
+ wizard_on_1:wizard_on_val[0],
+ wizard_on_2:wizard_on_val[1],
+ wizard_on_3:wizard_on_val[2],
+ wizard_on_4:wizard_on_val[3],
+ wizard_on_5:wizard_on_val[4]
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ button:{
+ link:'/',
+ name:'Deploy New Cartridge',
+ class_name:''
+ },
+ has_help:false,
+ step_data:true,
+ config_status:data.config_status,
+ wizard_on:true,
+ wizard_on_1:wizard_on_val[0],
+ wizard_on_2:wizard_on_val[1],
+ wizard_on_3:wizard_on_val[2],
+ wizard_on_4:wizard_on_val[3],
+ wizard_on_5:wizard_on_val[4],
+ step:step,
+ configure_stratos:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:title
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
index 35c4375..37b30dc 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
@@ -1,34 +1,38 @@
var render = function (theme, data, meta, require) {
- // Re-create the data structure of the cartridges.
- /* var mycartridges = [
- {
- kind: "cartridges",
- cartridges: []}
- ];
- var cartridgesToPush;
- for(var i=0;i<data.mycartridges.length;i++){
- if(data.mycartridges[i].category == undefined){
- cartridgesToPush = null;
- for(var j=0;j<mycartridges.length;j++){
- if(mycartridges[j].kind == "cartridges" ){
- cartridgesToPush = mycartridges[j].cartridges;
- }
- }
- cartridgesToPush.push(data.mycartridges[i]);
- }else{
- cartridgesToPush = null;
- for (var j = 0; j < mycartridges.length; j++) {
- if (mycartridges[j].kind == data.mycartridges[i].category) {
- cartridgesToPush = mycartridges[j].cartridges;
- }
- }
- if(cartridgesToPush == null){
- mycartridges.push({kind:data.mycartridges[i].category,cartridges:[data.mycartridges[i]]})
- }else{
- cartridgesToPush.push(data.mycartridges[i]);
- }
- }
- }*/
+ // Re-create the data structure of the cartridges.
+ var log = new Log();
+ var cartridges_old = data.mycartridges.cartridge;
+ var cartridges_new = [
+ {
+ kind: "Cartridges",
+ cartridges: []}
+ ];
+ var cartridgesToPush;
+ for (var i = 0; i < cartridges_old.length; i++) {
+ if (cartridges_old[i].category == undefined) {
+ cartridgesToPush = null;
+ for (var j = 0; j < cartridges_new.length; j++) {
+ if (cartridges_new[j].kind == "Cartridges") {
+ cartridgesToPush = cartridges_new[j].cartridges;
+ }
+ }
+ cartridgesToPush.push(cartridges_old[i]);
+ log.info(cartridges_old[i]);
+ } else {
+ cartridgesToPush = null;
+ for (var j = 0; j < cartridges_new.length; j++) {
+ if (cartridges_new[j].kind == cartridges_old[i].category) {
+ cartridgesToPush = cartridges_new[j].cartridges;
+ }
+ }
+ if (cartridgesToPush == null) {
+ cartridges_new.push({kind: cartridges_old[i].category, cartridges: [cartridges_old[i]]})
+ } else {
+ cartridgesToPush.push(cartridges_old[i]);
+ }
+ }
+ }
+ log.info(cartridges_new);
theme('index', {
body: [
@@ -36,7 +40,7 @@ var render = function (theme, data, meta, require) {
partial: 'mycartridges',
context: {
title: 'My Cartridges',
- mycartridges: {}
+ mycartridges: cartridges_new
}
}
],
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
new file mode 100644
index 0000000..8b676ab
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
@@ -0,0 +1,42 @@
+var render = function (theme, data, meta, require) {
+
+ var create_btn_class = 'btn-important';
+ var title = 'Tenant Management';
+ theme('index', {
+ body: [
+ {
+ partial: 'tenant_management',
+ context: {
+ title:title,
+ tenants:data.tenants
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Tenant Management',
+ button:{
+ link:'/tenant_new.jag',
+ name:'Add New Tenant',
+ class_name:create_btn_class
+ },
+ has_help:true,
+ help:"Tenants you create has permission to view and subscribe to Cartridges. Tenants don't have permission to do Partition deployment, Policy deployment, LB Creation, and MT service deployment.",
+ tenant_mgt:true,
+ config_status:data.config_status,
+ has_action_buttons:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:title
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
new file mode 100644
index 0000000..3ae7026
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
@@ -0,0 +1,42 @@
+var render = function (theme, data, meta, require) {
+
+ var create_btn_class = 'btn-default';
+ var title = 'Tenant Management - Add New Tenant';
+ theme('index', {
+ body: [
+ {
+ partial: 'tenant_new',
+ context: {
+ title:title,
+ tenants:data.tenants
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:title,
+ button:{
+ link:'/tenant_management.jag',
+ name:'Tenant Management',
+ class_name:create_btn_class,
+ class_icon:'fa fa-arrow-left'
+ },
+ has_help:true,
+ help:"Tenants you create has permission to view and subscribe to Cartridges. Tenants don't have permission to do Partition deployment, Policy deployment, LB Creation, and MT service deployment.",
+ tenant_mgt:true,
+ config_status:data.config_status
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:title
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
[2/4] commiting changes provided by Chanaka Jayasena, STRATOS-359
Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js b/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js
index 65c51ee..2744cae 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js
@@ -1 +1,36 @@
-var engine = require('caramel').engine('handlebars');
\ No newline at end of file
+//var engine = require('caramel').engine('handlebars');
+
+var engine = require('caramel').engine('handlebars', (function () {
+ return {
+ partials: function (Handlebars) {
+ Handlebars.registerHelper("ifCon", function(conditional, options) {
+ if (options.hash.desired === options.hash.type) {
+ options.fn(this);
+ } else {
+ options.inverse(this);
+ }
+ });
+ /*
+ Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
+
+ switch (operator) {
+ case '==':
+ return (v1 == v2) ? options.fn(this) : options.inverse(this);
+ case '===':
+ return (v1 === v2) ? options.fn(this) : options.inverse(this);
+ case '<':
+ return (v1 < v2) ? options.fn(this) : options.inverse(this);
+ case '<=':
+ return (v1 <= v2) ? options.fn(this) : options.inverse(this);
+ case '>':
+ return (v1 > v2) ? options.fn(this) : options.inverse(this);
+ case '>=':
+ return (v1 >= v2) ? options.fn(this) : options.inverse(this);
+ default:
+ return options.inverse(this);
+ }
+ });
+ */
+ }
+ }
+}));
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/bootstrap.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/bootstrap.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/bootstrap.css
index bbda4ee..a655c56 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/bootstrap.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/bootstrap.css
@@ -1,14 +1,10 @@
/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
+ * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
*/
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
article,
aside,
@@ -36,7 +32,8 @@ audio:not([controls]) {
height: 0;
}
-[hidden] {
+[hidden],
+template {
display: none;
}
@@ -50,6 +47,10 @@ body {
margin: 0;
}
+a {
+ background: transparent;
+}
+
a:focus {
outline: thin dotted;
}
@@ -230,7 +231,6 @@ table {
abbr[title]:after {
content: " (" attr(title) ")";
}
- .ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
@@ -263,6 +263,9 @@ table {
h3 {
page-break-after: avoid;
}
+ select {
+ background: #fff !important;
+ }
.navbar {
display: none;
}
@@ -316,13 +319,6 @@ textarea {
line-height: inherit;
}
-button,
-input,
-select[multiple],
-textarea {
- background-image: none;
-}
-
a {
color: #428bca;
text-decoration: none;
@@ -335,7 +331,7 @@ a:focus {
}
a:focus {
- outline: thin dotted #333;
+ outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -385,71 +381,10 @@ hr {
padding: 0;
margin: -1px;
overflow: hidden;
- clip: rect(0 0 0 0);
+ clip: rect(0, 0, 0, 0);
border: 0;
}
-p {
- margin: 0 0 10px;
-}
-
-.lead {
- margin-bottom: 20px;
- font-size: 16.099999999999998px;
- font-weight: 200;
- line-height: 1.4;
-}
-
-@media (min-width: 768px) {
- .lead {
- font-size: 21px;
- }
-}
-
-small {
- font-size: 85%;
-}
-
-cite {
- font-style: normal;
-}
-
-.text-muted {
- color: #999999;
-}
-
-.text-primary {
- color: #428bca;
-}
-
-.text-warning {
- color: #c09853;
-}
-
-.text-danger {
- color: #b94a48;
-}
-
-.text-success {
- color: #468847;
-}
-
-.text-info {
- color: #3a87ad;
-}
-
-.text-left {
- text-align: left;
-}
-
-.text-right {
- text-align: right;
-}
-
-.text-center {
- text-align: center;
-}
-
h1,
h2,
h3,
@@ -465,6 +400,7 @@ h6,
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
line-height: 1.1;
+ color: inherit;
}
h1 small,
@@ -478,7 +414,19 @@ h6 small,
.h3 small,
.h4 small,
.h5 small,
-.h6 small {
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
font-weight: normal;
line-height: 1;
color: #999999;
@@ -491,6 +439,15 @@ h3 {
margin-bottom: 10px;
}
+h1 small,
+h2 small,
+h3 small,
+h1 .small,
+h2 .small,
+h3 .small {
+ font-size: 65%;
+}
+
h4,
h5,
h6 {
@@ -498,6 +455,15 @@ h6 {
margin-bottom: 10px;
}
+h4 small,
+h5 small,
+h6 small,
+h4 .small,
+h5 .small,
+h6 .small {
+ font-size: 75%;
+}
+
h1,
.h1 {
font-size: 36px;
@@ -528,21 +494,86 @@ h6,
font-size: 12px;
}
-h1 small,
-.h1 small {
- font-size: 24px;
+p {
+ margin: 0 0 10px;
}
-h2 small,
-.h2 small {
- font-size: 18px;
+.lead {
+ margin-bottom: 20px;
+ font-size: 16px;
+ font-weight: 200;
+ line-height: 1.4;
}
-h3 small,
-.h3 small,
-h4 small,
-.h4 small {
- font-size: 14px;
+@media (min-width: 768px) {
+ .lead {
+ font-size: 21px;
+ }
+}
+
+small,
+.small {
+ font-size: 85%;
+}
+
+cite {
+ font-style: normal;
+}
+
+.text-muted {
+ color: #999999;
+}
+
+.text-primary {
+ color: #428bca;
+}
+
+.text-primary:hover {
+ color: #3071a9;
+}
+
+.text-warning {
+ color: #8a6d3b;
+}
+
+.text-warning:hover {
+ color: #66512c;
+}
+
+.text-danger {
+ color: #a94442;
+}
+
+.text-danger:hover {
+ color: #843534;
+}
+
+.text-success {
+ color: #3c763d;
+}
+
+.text-success:hover {
+ color: #2b542c;
+}
+
+.text-info {
+ color: #31708f;
+}
+
+.text-info:hover {
+ color: #245269;
+}
+
+.text-left {
+ text-align: left;
+}
+
+.text-right {
+ text-align: right;
+}
+
+.text-center {
+ text-align: center;
}
.page-header {
@@ -580,7 +611,12 @@ ol ol {
padding-left: 5px;
}
+.list-inline > li:first-child {
+ padding-left: 0;
+}
+
dl {
+ margin-top: 0;
margin-bottom: 20px;
}
@@ -634,7 +670,7 @@ abbr[data-original-title] {
border-bottom: 1px dotted #999999;
}
-abbr.initialism {
+.initialism {
font-size: 90%;
text-transform: uppercase;
}
@@ -655,13 +691,15 @@ blockquote p:last-child {
margin-bottom: 0;
}
-blockquote small {
+blockquote small,
+blockquote .small {
display: block;
line-height: 1.428571429;
color: #999999;
}
-blockquote small:before {
+blockquote small:before,
+blockquote .small:before {
content: '\2014 \00A0';
}
@@ -673,35 +711,37 @@ blockquote.pull-right {
}
blockquote.pull-right p,
-blockquote.pull-right small {
+blockquote.pull-right small,
+blockquote.pull-right .small {
text-align: right;
}
-blockquote.pull-right small:before {
+blockquote.pull-right small:before,
+blockquote.pull-right .small:before {
content: '';
}
-blockquote.pull-right small:after {
+blockquote.pull-right small:after,
+blockquote.pull-right .small:after {
content: '\00A0 \2014';
}
-q:before,
-q:after,
blockquote:before,
blockquote:after {
content: "";
}
address {
- display: block;
margin-bottom: 20px;
font-style: normal;
line-height: 1.428571429;
}
code,
-pre {
- font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+kbd,
+pre,
+samp {
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
@@ -727,17 +767,13 @@ pre {
border-radius: 4px;
}
-pre.prettyprint {
- margin-bottom: 20px;
-}
-
pre code {
padding: 0;
font-size: inherit;
color: inherit;
white-space: pre-wrap;
background-color: transparent;
- border: 0;
+ border-radius: 0;
}
.pre-scrollable {
@@ -772,6 +808,24 @@ pre code {
clear: both;
}
+@media (min-width: 768px) {
+ .container {
+ width: 750px;
+ }
+}
+
+@media (min-width: 992px) {
+ .container {
+ width: 970px;
+ }
+}
+
+@media (min-width: 1200px) {
+ .container {
+ width: 1170px;
+ }
+}
+
.row {
margin-right: -15px;
margin-left: -15px;
@@ -798,52 +852,52 @@ pre code {
}
.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11,
-.col-xs-12,
.col-sm-1,
-.col-sm-2,
-.col-sm-3,
-.col-sm-4,
-.col-sm-5,
-.col-sm-6,
-.col-sm-7,
-.col-sm-8,
-.col-sm-9,
-.col-sm-10,
-.col-sm-11,
-.col-sm-12,
.col-md-1,
-.col-md-2,
-.col-md-3,
-.col-md-4,
-.col-md-5,
-.col-md-6,
-.col-md-7,
-.col-md-8,
-.col-md-9,
-.col-md-10,
-.col-md-11,
-.col-md-12,
.col-lg-1,
+.col-xs-2,
+.col-sm-2,
+.col-md-2,
.col-lg-2,
+.col-xs-3,
+.col-sm-3,
+.col-md-3,
.col-lg-3,
+.col-xs-4,
+.col-sm-4,
+.col-md-4,
.col-lg-4,
+.col-xs-5,
+.col-sm-5,
+.col-md-5,
.col-lg-5,
+.col-xs-6,
+.col-sm-6,
+.col-md-6,
.col-lg-6,
+.col-xs-7,
+.col-sm-7,
+.col-md-7,
.col-lg-7,
+.col-xs-8,
+.col-sm-8,
+.col-md-8,
.col-lg-8,
+.col-xs-9,
+.col-sm-9,
+.col-md-9,
.col-lg-9,
+.col-xs-10,
+.col-sm-10,
+.col-md-10,
.col-lg-10,
+.col-xs-11,
+.col-sm-11,
+.col-md-11,
.col-lg-11,
+.col-xs-12,
+.col-sm-12,
+.col-md-12,
.col-lg-12 {
position: relative;
min-height: 1px;
@@ -861,62 +915,216 @@ pre code {
.col-xs-8,
.col-xs-9,
.col-xs-10,
-.col-xs-11 {
+.col-xs-11,
+.col-xs-12 {
float: left;
}
-.col-xs-1 {
- width: 8.333333333333332%;
+.col-xs-12 {
+ width: 100%;
}
-.col-xs-2 {
- width: 16.666666666666664%;
+.col-xs-11 {
+ width: 91.66666666666666%;
}
-.col-xs-3 {
- width: 25%;
+.col-xs-10 {
+ width: 83.33333333333334%;
}
-.col-xs-4 {
- width: 33.33333333333333%;
+.col-xs-9 {
+ width: 75%;
}
-.col-xs-5 {
- width: 41.66666666666667%;
+.col-xs-8 {
+ width: 66.66666666666666%;
+}
+
+.col-xs-7 {
+ width: 58.333333333333336%;
}
.col-xs-6 {
width: 50%;
}
-.col-xs-7 {
- width: 58.333333333333336%;
+.col-xs-5 {
+ width: 41.66666666666667%;
}
-.col-xs-8 {
- width: 66.66666666666666%;
+.col-xs-4 {
+ width: 33.33333333333333%;
}
-.col-xs-9 {
- width: 75%;
+.col-xs-3 {
+ width: 25%;
}
-.col-xs-10 {
- width: 83.33333333333334%;
+.col-xs-2 {
+ width: 16.666666666666664%;
}
-.col-xs-11 {
- width: 91.66666666666666%;
+.col-xs-1 {
+ width: 8.333333333333332%;
}
-.col-xs-12 {
- width: 100%;
+.col-xs-pull-12 {
+ right: 100%;
+}
+
+.col-xs-pull-11 {
+ right: 91.66666666666666%;
+}
+
+.col-xs-pull-10 {
+ right: 83.33333333333334%;
+}
+
+.col-xs-pull-9 {
+ right: 75%;
+}
+
+.col-xs-pull-8 {
+ right: 66.66666666666666%;
+}
+
+.col-xs-pull-7 {
+ right: 58.333333333333336%;
+}
+
+.col-xs-pull-6 {
+ right: 50%;
+}
+
+.col-xs-pull-5 {
+ right: 41.66666666666667%;
+}
+
+.col-xs-pull-4 {
+ right: 33.33333333333333%;
+}
+
+.col-xs-pull-3 {
+ right: 25%;
+}
+
+.col-xs-pull-2 {
+ right: 16.666666666666664%;
+}
+
+.col-xs-pull-1 {
+ right: 8.333333333333332%;
+}
+
+.col-xs-pull-0 {
+ right: 0;
+}
+
+.col-xs-push-12 {
+ left: 100%;
+}
+
+.col-xs-push-11 {
+ left: 91.66666666666666%;
+}
+
+.col-xs-push-10 {
+ left: 83.33333333333334%;
+}
+
+.col-xs-push-9 {
+ left: 75%;
+}
+
+.col-xs-push-8 {
+ left: 66.66666666666666%;
+}
+
+.col-xs-push-7 {
+ left: 58.333333333333336%;
+}
+
+.col-xs-push-6 {
+ left: 50%;
+}
+
+.col-xs-push-5 {
+ left: 41.66666666666667%;
+}
+
+.col-xs-push-4 {
+ left: 33.33333333333333%;
+}
+
+.col-xs-push-3 {
+ left: 25%;
+}
+
+.col-xs-push-2 {
+ left: 16.666666666666664%;
+}
+
+.col-xs-push-1 {
+ left: 8.333333333333332%;
+}
+
+.col-xs-push-0 {
+ left: 0;
+}
+
+.col-xs-offset-12 {
+ margin-left: 100%;
+}
+
+.col-xs-offset-11 {
+ margin-left: 91.66666666666666%;
+}
+
+.col-xs-offset-10 {
+ margin-left: 83.33333333333334%;
+}
+
+.col-xs-offset-9 {
+ margin-left: 75%;
+}
+
+.col-xs-offset-8 {
+ margin-left: 66.66666666666666%;
+}
+
+.col-xs-offset-7 {
+ margin-left: 58.333333333333336%;
+}
+
+.col-xs-offset-6 {
+ margin-left: 50%;
+}
+
+.col-xs-offset-5 {
+ margin-left: 41.66666666666667%;
+}
+
+.col-xs-offset-4 {
+ margin-left: 33.33333333333333%;
+}
+
+.col-xs-offset-3 {
+ margin-left: 25%;
+}
+
+.col-xs-offset-2 {
+ margin-left: 16.666666666666664%;
+}
+
+.col-xs-offset-1 {
+ margin-left: 8.333333333333332%;
+}
+
+.col-xs-offset-0 {
+ margin-left: 0;
}
@media (min-width: 768px) {
- .container {
- max-width: 750px;
- }
.col-sm-1,
.col-sm-2,
.col-sm-3,
@@ -927,150 +1135,166 @@ pre code {
.col-sm-8,
.col-sm-9,
.col-sm-10,
- .col-sm-11 {
+ .col-sm-11,
+ .col-sm-12 {
float: left;
}
- .col-sm-1 {
- width: 8.333333333333332%;
+ .col-sm-12 {
+ width: 100%;
}
- .col-sm-2 {
- width: 16.666666666666664%;
+ .col-sm-11 {
+ width: 91.66666666666666%;
}
- .col-sm-3 {
- width: 25%;
+ .col-sm-10 {
+ width: 83.33333333333334%;
}
- .col-sm-4 {
- width: 33.33333333333333%;
+ .col-sm-9 {
+ width: 75%;
}
- .col-sm-5 {
- width: 41.66666666666667%;
+ .col-sm-8 {
+ width: 66.66666666666666%;
+ }
+ .col-sm-7 {
+ width: 58.333333333333336%;
}
.col-sm-6 {
width: 50%;
}
- .col-sm-7 {
- width: 58.333333333333336%;
+ .col-sm-5 {
+ width: 41.66666666666667%;
}
- .col-sm-8 {
- width: 66.66666666666666%;
+ .col-sm-4 {
+ width: 33.33333333333333%;
}
- .col-sm-9 {
- width: 75%;
+ .col-sm-3 {
+ width: 25%;
}
- .col-sm-10 {
- width: 83.33333333333334%;
+ .col-sm-2 {
+ width: 16.666666666666664%;
}
- .col-sm-11 {
- width: 91.66666666666666%;
+ .col-sm-1 {
+ width: 8.333333333333332%;
}
- .col-sm-12 {
- width: 100%;
+ .col-sm-pull-12 {
+ right: 100%;
}
- .col-sm-push-1 {
- left: 8.333333333333332%;
+ .col-sm-pull-11 {
+ right: 91.66666666666666%;
}
- .col-sm-push-2 {
- left: 16.666666666666664%;
+ .col-sm-pull-10 {
+ right: 83.33333333333334%;
}
- .col-sm-push-3 {
- left: 25%;
+ .col-sm-pull-9 {
+ right: 75%;
}
- .col-sm-push-4 {
- left: 33.33333333333333%;
+ .col-sm-pull-8 {
+ right: 66.66666666666666%;
}
- .col-sm-push-5 {
- left: 41.66666666666667%;
+ .col-sm-pull-7 {
+ right: 58.333333333333336%;
}
- .col-sm-push-6 {
- left: 50%;
+ .col-sm-pull-6 {
+ right: 50%;
}
- .col-sm-push-7 {
- left: 58.333333333333336%;
+ .col-sm-pull-5 {
+ right: 41.66666666666667%;
}
- .col-sm-push-8 {
- left: 66.66666666666666%;
+ .col-sm-pull-4 {
+ right: 33.33333333333333%;
}
- .col-sm-push-9 {
- left: 75%;
+ .col-sm-pull-3 {
+ right: 25%;
}
- .col-sm-push-10 {
- left: 83.33333333333334%;
+ .col-sm-pull-2 {
+ right: 16.666666666666664%;
+ }
+ .col-sm-pull-1 {
+ right: 8.333333333333332%;
+ }
+ .col-sm-pull-0 {
+ right: 0;
+ }
+ .col-sm-push-12 {
+ left: 100%;
}
.col-sm-push-11 {
left: 91.66666666666666%;
}
- .col-sm-pull-1 {
- right: 8.333333333333332%;
+ .col-sm-push-10 {
+ left: 83.33333333333334%;
}
- .col-sm-pull-2 {
- right: 16.666666666666664%;
+ .col-sm-push-9 {
+ left: 75%;
}
- .col-sm-pull-3 {
- right: 25%;
+ .col-sm-push-8 {
+ left: 66.66666666666666%;
}
- .col-sm-pull-4 {
- right: 33.33333333333333%;
+ .col-sm-push-7 {
+ left: 58.333333333333336%;
}
- .col-sm-pull-5 {
- right: 41.66666666666667%;
+ .col-sm-push-6 {
+ left: 50%;
}
- .col-sm-pull-6 {
- right: 50%;
+ .col-sm-push-5 {
+ left: 41.66666666666667%;
}
- .col-sm-pull-7 {
- right: 58.333333333333336%;
+ .col-sm-push-4 {
+ left: 33.33333333333333%;
}
- .col-sm-pull-8 {
- right: 66.66666666666666%;
+ .col-sm-push-3 {
+ left: 25%;
}
- .col-sm-pull-9 {
- right: 75%;
+ .col-sm-push-2 {
+ left: 16.666666666666664%;
}
- .col-sm-pull-10 {
- right: 83.33333333333334%;
+ .col-sm-push-1 {
+ left: 8.333333333333332%;
}
- .col-sm-pull-11 {
- right: 91.66666666666666%;
+ .col-sm-push-0 {
+ left: 0;
}
- .col-sm-offset-1 {
- margin-left: 8.333333333333332%;
+ .col-sm-offset-12 {
+ margin-left: 100%;
}
- .col-sm-offset-2 {
- margin-left: 16.666666666666664%;
+ .col-sm-offset-11 {
+ margin-left: 91.66666666666666%;
}
- .col-sm-offset-3 {
- margin-left: 25%;
+ .col-sm-offset-10 {
+ margin-left: 83.33333333333334%;
}
- .col-sm-offset-4 {
- margin-left: 33.33333333333333%;
+ .col-sm-offset-9 {
+ margin-left: 75%;
}
- .col-sm-offset-5 {
- margin-left: 41.66666666666667%;
+ .col-sm-offset-8 {
+ margin-left: 66.66666666666666%;
+ }
+ .col-sm-offset-7 {
+ margin-left: 58.333333333333336%;
}
.col-sm-offset-6 {
margin-left: 50%;
}
- .col-sm-offset-7 {
- margin-left: 58.333333333333336%;
+ .col-sm-offset-5 {
+ margin-left: 41.66666666666667%;
}
- .col-sm-offset-8 {
- margin-left: 66.66666666666666%;
+ .col-sm-offset-4 {
+ margin-left: 33.33333333333333%;
}
- .col-sm-offset-9 {
- margin-left: 75%;
+ .col-sm-offset-3 {
+ margin-left: 25%;
}
- .col-sm-offset-10 {
- margin-left: 83.33333333333334%;
+ .col-sm-offset-2 {
+ margin-left: 16.666666666666664%;
}
- .col-sm-offset-11 {
- margin-left: 91.66666666666666%;
+ .col-sm-offset-1 {
+ margin-left: 8.333333333333332%;
+ }
+ .col-sm-offset-0 {
+ margin-left: 0;
}
}
@media (min-width: 992px) {
- .container {
- max-width: 970px;
- }
.col-md-1,
.col-md-2,
.col-md-3,
@@ -1081,159 +1305,166 @@ pre code {
.col-md-8,
.col-md-9,
.col-md-10,
- .col-md-11 {
+ .col-md-11,
+ .col-md-12 {
float: left;
}
- .col-md-1 {
- width: 8.333333333333332%;
- }
- .col-md-2 {
- width: 16.666666666666664%;
+ .col-md-12 {
+ width: 100%;
}
- .col-md-3 {
- width: 25%;
+ .col-md-11 {
+ width: 91.66666666666666%;
}
- .col-md-4 {
- width: 33.33333333333333%;
+ .col-md-10 {
+ width: 83.33333333333334%;
}
- .col-md-5 {
- width: 41.66666666666667%;
+ .col-md-9 {
+ width: 75%;
}
- .col-md-6 {
- width: 50%;
+ .col-md-8 {
+ width: 66.66666666666666%;
}
.col-md-7 {
width: 58.333333333333336%;
}
- .col-md-8 {
- width: 66.66666666666666%;
- }
- .col-md-9 {
- width: 75%;
+ .col-md-6 {
+ width: 50%;
}
- .col-md-10 {
- width: 83.33333333333334%;
+ .col-md-5 {
+ width: 41.66666666666667%;
}
- .col-md-11 {
- width: 91.66666666666666%;
+ .col-md-4 {
+ width: 33.33333333333333%;
}
- .col-md-12 {
- width: 100%;
+ .col-md-3 {
+ width: 25%;
}
- .col-md-push-0 {
- left: auto;
+ .col-md-2 {
+ width: 16.666666666666664%;
}
- .col-md-push-1 {
- left: 8.333333333333332%;
+ .col-md-1 {
+ width: 8.333333333333332%;
}
- .col-md-push-2 {
- left: 16.666666666666664%;
+ .col-md-pull-12 {
+ right: 100%;
}
- .col-md-push-3 {
- left: 25%;
+ .col-md-pull-11 {
+ right: 91.66666666666666%;
}
- .col-md-push-4 {
- left: 33.33333333333333%;
+ .col-md-pull-10 {
+ right: 83.33333333333334%;
}
- .col-md-push-5 {
- left: 41.66666666666667%;
+ .col-md-pull-9 {
+ right: 75%;
}
- .col-md-push-6 {
- left: 50%;
+ .col-md-pull-8 {
+ right: 66.66666666666666%;
}
- .col-md-push-7 {
- left: 58.333333333333336%;
+ .col-md-pull-7 {
+ right: 58.333333333333336%;
}
- .col-md-push-8 {
- left: 66.66666666666666%;
+ .col-md-pull-6 {
+ right: 50%;
}
- .col-md-push-9 {
- left: 75%;
+ .col-md-pull-5 {
+ right: 41.66666666666667%;
}
- .col-md-push-10 {
- left: 83.33333333333334%;
+ .col-md-pull-4 {
+ right: 33.33333333333333%;
}
- .col-md-push-11 {
- left: 91.66666666666666%;
+ .col-md-pull-3 {
+ right: 25%;
}
- .col-md-pull-0 {
- right: auto;
+ .col-md-pull-2 {
+ right: 16.666666666666664%;
}
.col-md-pull-1 {
right: 8.333333333333332%;
}
- .col-md-pull-2 {
- right: 16.666666666666664%;
+ .col-md-pull-0 {
+ right: 0;
}
- .col-md-pull-3 {
- right: 25%;
+ .col-md-push-12 {
+ left: 100%;
}
- .col-md-pull-4 {
- right: 33.33333333333333%;
+ .col-md-push-11 {
+ left: 91.66666666666666%;
}
- .col-md-pull-5 {
- right: 41.66666666666667%;
+ .col-md-push-10 {
+ left: 83.33333333333334%;
}
- .col-md-pull-6 {
- right: 50%;
+ .col-md-push-9 {
+ left: 75%;
}
- .col-md-pull-7 {
- right: 58.333333333333336%;
+ .col-md-push-8 {
+ left: 66.66666666666666%;
}
- .col-md-pull-8 {
- right: 66.66666666666666%;
+ .col-md-push-7 {
+ left: 58.333333333333336%;
}
- .col-md-pull-9 {
- right: 75%;
+ .col-md-push-6 {
+ left: 50%;
}
- .col-md-pull-10 {
- right: 83.33333333333334%;
+ .col-md-push-5 {
+ left: 41.66666666666667%;
}
- .col-md-pull-11 {
- right: 91.66666666666666%;
+ .col-md-push-4 {
+ left: 33.33333333333333%;
}
- .col-md-offset-0 {
- margin-left: 0;
+ .col-md-push-3 {
+ left: 25%;
+ }
+ .col-md-push-2 {
+ left: 16.666666666666664%;
+ }
+ .col-md-push-1 {
+ left: 8.333333333333332%;
+ }
+ .col-md-push-0 {
+ left: 0;
}
- .col-md-offset-1 {
- margin-left: 8.333333333333332%;
+ .col-md-offset-12 {
+ margin-left: 100%;
}
- .col-md-offset-2 {
- margin-left: 16.666666666666664%;
+ .col-md-offset-11 {
+ margin-left: 91.66666666666666%;
}
- .col-md-offset-3 {
- margin-left: 25%;
+ .col-md-offset-10 {
+ margin-left: 83.33333333333334%;
}
- .col-md-offset-4 {
- margin-left: 33.33333333333333%;
+ .col-md-offset-9 {
+ margin-left: 75%;
}
- .col-md-offset-5 {
- margin-left: 41.66666666666667%;
+ .col-md-offset-8 {
+ margin-left: 66.66666666666666%;
+ }
+ .col-md-offset-7 {
+ margin-left: 58.333333333333336%;
}
.col-md-offset-6 {
margin-left: 50%;
}
- .col-md-offset-7 {
- margin-left: 58.333333333333336%;
+ .col-md-offset-5 {
+ margin-left: 41.66666666666667%;
}
- .col-md-offset-8 {
- margin-left: 66.66666666666666%;
+ .col-md-offset-4 {
+ margin-left: 33.33333333333333%;
}
- .col-md-offset-9 {
- margin-left: 75%;
+ .col-md-offset-3 {
+ margin-left: 25%;
}
- .col-md-offset-10 {
- margin-left: 83.33333333333334%;
+ .col-md-offset-2 {
+ margin-left: 16.666666666666664%;
}
- .col-md-offset-11 {
- margin-left: 91.66666666666666%;
+ .col-md-offset-1 {
+ margin-left: 8.333333333333332%;
+ }
+ .col-md-offset-0 {
+ margin-left: 0;
}
}
-@media (min-width: 1200px) {
- .container {
- max-width: 1170px;
- }
+@media (min-width: 900px) {
.col-lg-1,
.col-lg-2,
.col-lg-3,
@@ -1244,152 +1475,162 @@ pre code {
.col-lg-8,
.col-lg-9,
.col-lg-10,
- .col-lg-11 {
+ .col-lg-11,
+ .col-lg-12 {
float: left;
}
- .col-lg-1 {
- width: 8.333333333333332%;
+ .col-lg-12 {
+ width: 100%;
}
- .col-lg-2 {
- width: 16.666666666666664%;
+ .col-lg-11 {
+ width: 91.66666666666666%;
}
- .col-lg-3 {
- width: 25%;
+ .col-lg-10 {
+ width: 83.33333333333334%;
}
- .col-lg-4 {
- width: 33.33333333333333%;
+ .col-lg-9 {
+ width: 75%;
}
- .col-lg-5 {
- width: 41.66666666666667%;
+ .col-lg-8 {
+ width: 66.66666666666666%;
+ }
+ .col-lg-7 {
+ width: 58.333333333333336%;
}
.col-lg-6 {
width: 50%;
}
- .col-lg-7 {
- width: 58.333333333333336%;
+ .col-lg-5 {
+ width: 41.66666666666667%;
}
- .col-lg-8 {
- width: 66.66666666666666%;
+ .col-lg-4 {
+ width: 33.33333333333333%;
}
- .col-lg-9 {
- width: 75%;
+ .col-lg-3 {
+ width: 25%;
}
- .col-lg-10 {
- width: 83.33333333333334%;
+ .col-lg-2 {
+ width: 16.666666666666664%;
}
- .col-lg-11 {
- width: 91.66666666666666%;
+ .col-lg-1 {
+ width: 8.333333333333332%;
}
- .col-lg-12 {
- width: 100%;
+ .col-lg-pull-12 {
+ right: 100%;
}
- .col-lg-push-0 {
- left: auto;
+ .col-lg-pull-11 {
+ right: 91.66666666666666%;
}
- .col-lg-push-1 {
- left: 8.333333333333332%;
+ .col-lg-pull-10 {
+ right: 83.33333333333334%;
}
- .col-lg-push-2 {
- left: 16.666666666666664%;
+ .col-lg-pull-9 {
+ right: 75%;
}
- .col-lg-push-3 {
- left: 25%;
+ .col-lg-pull-8 {
+ right: 66.66666666666666%;
}
- .col-lg-push-4 {
- left: 33.33333333333333%;
+ .col-lg-pull-7 {
+ right: 58.333333333333336%;
}
- .col-lg-push-5 {
- left: 41.66666666666667%;
+ .col-lg-pull-6 {
+ right: 50%;
}
- .col-lg-push-6 {
- left: 50%;
+ .col-lg-pull-5 {
+ right: 41.66666666666667%;
}
- .col-lg-push-7 {
- left: 58.333333333333336%;
+ .col-lg-pull-4 {
+ right: 33.33333333333333%;
}
- .col-lg-push-8 {
- left: 66.66666666666666%;
+ .col-lg-pull-3 {
+ right: 25%;
}
- .col-lg-push-9 {
- left: 75%;
+ .col-lg-pull-2 {
+ right: 16.666666666666664%;
}
- .col-lg-push-10 {
- left: 83.33333333333334%;
+ .col-lg-pull-1 {
+ right: 8.333333333333332%;
+ }
+ .col-lg-pull-0 {
+ right: 0;
+ }
+ .col-lg-push-12 {
+ left: 100%;
}
.col-lg-push-11 {
left: 91.66666666666666%;
}
- .col-lg-pull-0 {
- right: auto;
- }
- .col-lg-pull-1 {
- right: 8.333333333333332%;
+ .col-lg-push-10 {
+ left: 83.33333333333334%;
}
- .col-lg-pull-2 {
- right: 16.666666666666664%;
+ .col-lg-push-9 {
+ left: 75%;
}
- .col-lg-pull-3 {
- right: 25%;
+ .col-lg-push-8 {
+ left: 66.66666666666666%;
}
- .col-lg-pull-4 {
- right: 33.33333333333333%;
+ .col-lg-push-7 {
+ left: 58.333333333333336%;
}
- .col-lg-pull-5 {
- right: 41.66666666666667%;
+ .col-lg-push-6 {
+ left: 50%;
}
- .col-lg-pull-6 {
- right: 50%;
+ .col-lg-push-5 {
+ left: 41.66666666666667%;
}
- .col-lg-pull-7 {
- right: 58.333333333333336%;
+ .col-lg-push-4 {
+ left: 33.33333333333333%;
}
- .col-lg-pull-8 {
- right: 66.66666666666666%;
+ .col-lg-push-3 {
+ left: 25%;
}
- .col-lg-pull-9 {
- right: 75%;
+ .col-lg-push-2 {
+ left: 16.666666666666664%;
}
- .col-lg-pull-10 {
- right: 83.33333333333334%;
+ .col-lg-push-1 {
+ left: 8.333333333333332%;
}
- .col-lg-pull-11 {
- right: 91.66666666666666%;
+ .col-lg-push-0 {
+ left: 0;
}
- .col-lg-offset-0 {
- margin-left: 0;
+ .col-lg-offset-12 {
+ margin-left: 100%;
}
- .col-lg-offset-1 {
- margin-left: 8.333333333333332%;
+ .col-lg-offset-11 {
+ margin-left: 91.66666666666666%;
}
- .col-lg-offset-2 {
- margin-left: 16.666666666666664%;
+ .col-lg-offset-10 {
+ margin-left: 83.33333333333334%;
}
- .col-lg-offset-3 {
- margin-left: 25%;
+ .col-lg-offset-9 {
+ margin-left: 75%;
}
- .col-lg-offset-4 {
- margin-left: 33.33333333333333%;
+ .col-lg-offset-8 {
+ margin-left: 66.66666666666666%;
}
- .col-lg-offset-5 {
- margin-left: 41.66666666666667%;
+ .col-lg-offset-7 {
+ margin-left: 58.333333333333336%;
}
.col-lg-offset-6 {
margin-left: 50%;
}
- .col-lg-offset-7 {
- margin-left: 58.333333333333336%;
+ .col-lg-offset-5 {
+ margin-left: 41.66666666666667%;
}
- .col-lg-offset-8 {
- margin-left: 66.66666666666666%;
+ .col-lg-offset-4 {
+ margin-left: 33.33333333333333%;
}
- .col-lg-offset-9 {
- margin-left: 75%;
+ .col-lg-offset-3 {
+ margin-left: 25%;
}
- .col-lg-offset-10 {
- margin-left: 83.33333333333334%;
+ .col-lg-offset-2 {
+ margin-left: 16.666666666666664%;
}
- .col-lg-offset-11 {
- margin-left: 91.66666666666666%;
+ .col-lg-offset-1 {
+ margin-left: 8.333333333333332%;
+ }
+ .col-lg-offset-0 {
+ margin-left: 0;
}
}
@@ -1407,33 +1648,33 @@ th {
margin-bottom: 20px;
}
-.table thead > tr > th,
-.table tbody > tr > th,
-.table tfoot > tr > th,
-.table thead > tr > td,
-.table tbody > tr > td,
-.table tfoot > tr > td {
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
padding: 8px;
line-height: 1.428571429;
vertical-align: top;
border-top: 1px solid #dddddd;
}
-.table thead > tr > th {
+.table > thead > tr > th {
vertical-align: bottom;
border-bottom: 2px solid #dddddd;
}
-.table caption + thead tr:first-child th,
-.table colgroup + thead tr:first-child th,
-.table thead:first-child tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child td {
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
border-top: 0;
}
-.table tbody + tbody {
+.table > tbody + tbody {
border-top: 2px solid #dddddd;
}
@@ -1441,12 +1682,12 @@ th {
background-color: #ffffff;
}
-.table-condensed thead > tr > th,
-.table-condensed tbody > tr > th,
-.table-condensed tfoot > tr > th,
-.table-condensed thead > tr > td,
-.table-condensed tbody > tr > td,
-.table-condensed tfoot > tr > td {
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
padding: 5px;
}
@@ -1479,6 +1720,7 @@ th {
}
table col[class*="col-"] {
+ position: static;
display: table-column;
float: none;
}
@@ -1489,101 +1731,90 @@ table th[class*="col-"] {
float: none;
}
-.table > thead > tr > td.active,
-.table > tbody > tr > td.active,
-.table > tfoot > tr > td.active,
-.table > thead > tr > th.active,
-.table > tbody > tr > th.active,
-.table > tfoot > tr > th.active,
-.table > thead > tr.active > td,
-.table > tbody > tr.active > td,
-.table > tfoot > tr.active > td,
-.table > thead > tr.active > th,
-.table > tbody > tr.active > th,
-.table > tfoot > tr.active > th {
+.table > thead > tr > .active,
+.table > tbody > tr > .active,
+.table > tfoot > tr > .active,
+.table > thead > .active > td,
+.table > tbody > .active > td,
+.table > tfoot > .active > td,
+.table > thead > .active > th,
+.table > tbody > .active > th,
+.table > tfoot > .active > th {
background-color: #f5f5f5;
}
-.table > thead > tr > td.success,
-.table > tbody > tr > td.success,
-.table > tfoot > tr > td.success,
-.table > thead > tr > th.success,
-.table > tbody > tr > th.success,
-.table > tfoot > tr > th.success,
-.table > thead > tr.success > td,
-.table > tbody > tr.success > td,
-.table > tfoot > tr.success > td,
-.table > thead > tr.success > th,
-.table > tbody > tr.success > th,
-.table > tfoot > tr.success > th {
+.table-hover > tbody > tr > .active:hover,
+.table-hover > tbody > .active:hover > td,
+.table-hover > tbody > .active:hover > th {
+ background-color: #e8e8e8;
+}
+
+.table > thead > tr > .success,
+.table > tbody > tr > .success,
+.table > tfoot > tr > .success,
+.table > thead > .success > td,
+.table > tbody > .success > td,
+.table > tfoot > .success > td,
+.table > thead > .success > th,
+.table > tbody > .success > th,
+.table > tfoot > .success > th {
background-color: #dff0d8;
- border-color: #d6e9c6;
}
-.table-hover > tbody > tr > td.success:hover,
-.table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td {
+.table-hover > tbody > tr > .success:hover,
+.table-hover > tbody > .success:hover > td,
+.table-hover > tbody > .success:hover > th {
background-color: #d0e9c6;
- border-color: #c9e2b3;
-}
-
-.table > thead > tr > td.danger,
-.table > tbody > tr > td.danger,
-.table > tfoot > tr > td.danger,
-.table > thead > tr > th.danger,
-.table > tbody > tr > th.danger,
-.table > tfoot > tr > th.danger,
-.table > thead > tr.danger > td,
-.table > tbody > tr.danger > td,
-.table > tfoot > tr.danger > td,
-.table > thead > tr.danger > th,
-.table > tbody > tr.danger > th,
-.table > tfoot > tr.danger > th {
+}
+
+.table > thead > tr > .danger,
+.table > tbody > tr > .danger,
+.table > tfoot > tr > .danger,
+.table > thead > .danger > td,
+.table > tbody > .danger > td,
+.table > tfoot > .danger > td,
+.table > thead > .danger > th,
+.table > tbody > .danger > th,
+.table > tfoot > .danger > th {
background-color: #f2dede;
- border-color: #eed3d7;
}
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td {
+.table-hover > tbody > tr > .danger:hover,
+.table-hover > tbody > .danger:hover > td,
+.table-hover > tbody > .danger:hover > th {
background-color: #ebcccc;
- border-color: #e6c1c7;
-}
-
-.table > thead > tr > td.warning,
-.table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
+}
+
+.table > thead > tr > .warning,
+.table > tbody > tr > .warning,
+.table > tfoot > tr > .warning,
+.table > thead > .warning > td,
+.table > tbody > .warning > td,
+.table > tfoot > .warning > td,
+.table > thead > .warning > th,
+.table > tbody > .warning > th,
+.table > tfoot > .warning > th {
background-color: #fcf8e3;
- border-color: #fbeed5;
}
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td {
+.table-hover > tbody > tr > .warning:hover,
+.table-hover > tbody > .warning:hover > td,
+.table-hover > tbody > .warning:hover > th {
background-color: #faf2cc;
- border-color: #f8e5be;
}
-@media (max-width: 768px) {
+@media (max-width: 767px) {
.table-responsive {
width: 100%;
margin-bottom: 15px;
overflow-x: scroll;
overflow-y: hidden;
border: 1px solid #dddddd;
+ -ms-overflow-style: -ms-autohiding-scrollbar;
+ -webkit-overflow-scrolling: touch;
}
.table-responsive > .table {
margin-bottom: 0;
- background-color: #fff;
}
.table-responsive > .table > thead > tr > th,
.table-responsive > .table > tbody > tr > th,
@@ -1612,10 +1843,8 @@ table th[class*="col-"] {
.table-responsive > .table-bordered > tfoot > tr > td:last-child {
border-right: 0;
}
- .table-responsive > .table-bordered > thead > tr:last-child > th,
.table-responsive > .table-bordered > tbody > tr:last-child > th,
.table-responsive > .table-bordered > tfoot > tr:last-child > th,
- .table-responsive > .table-bordered > thead > tr:last-child > td,
.table-responsive > .table-bordered > tbody > tr:last-child > td,
.table-responsive > .table-bordered > tfoot > tr:last-child > td {
border-bottom: 0;
@@ -1678,31 +1907,24 @@ select optgroup {
input[type="file"]:focus,
input[type="radio"]:focus,
-input[type="checkbox"]:focus {
- outline: thin dotted #333;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
-}
-
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
- height: auto;
-}
-
-.form-control:-moz-placeholder {
- color: #999999;
-}
-
-.form-control::-moz-placeholder {
- color: #999999;
+input[type="checkbox"]:focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
}
-.form-control:-ms-input-placeholder {
- color: #999999;
+input[type="number"]::-webkit-outer-spin-button,
+input[type="number"]::-webkit-inner-spin-button {
+ height: auto;
}
-.form-control::-webkit-input-placeholder {
- color: #999999;
+output {
+ display: block;
+ padding-top: 7px;
+ font-size: 14px;
+ line-height: 1.428571429;
+ color: #555555;
+ vertical-align: middle;
}
.form-control {
@@ -1715,6 +1937,7 @@ input[type="number"]::-webkit-inner-spin-button {
color: #555555;
vertical-align: middle;
background-color: #ffffff;
+ background-image: none;
border: 1px solid #cccccc;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -1730,6 +1953,23 @@ input[type="number"]::-webkit-inner-spin-button {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
+.form-control:-moz-placeholder {
+ color: #999999;
+}
+
+.form-control::-moz-placeholder {
+ color: #999999;
+ opacity: 1;
+}
+
+.form-control:-ms-input-placeholder {
+ color: #999999;
+}
+
+.form-control::-webkit-input-placeholder {
+ color: #999999;
+}
+
.form-control[disabled],
.form-control[readonly],
fieldset[disabled] .form-control {
@@ -1825,7 +2065,7 @@ textarea.input-sm {
}
.input-lg {
- height: 45px;
+ height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@@ -1833,8 +2073,8 @@ textarea.input-sm {
}
select.input-lg {
- height: 45px;
- line-height: 45px;
+ height: 46px;
+ line-height: 46px;
}
textarea.input-lg {
@@ -1842,76 +2082,87 @@ textarea.input-lg {
}
.has-warning .help-block,
-.has-warning .control-label {
- color: #c09853;
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline {
+ color: #8a6d3b;
}
.has-warning .form-control {
- border-color: #c09853;
+ border-color: #8a6d3b;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-warning .form-control:focus {
- border-color: #a47e3c;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+ border-color: #66512c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
}
.has-warning .input-group-addon {
- color: #c09853;
+ color: #8a6d3b;
background-color: #fcf8e3;
- border-color: #c09853;
+ border-color: #8a6d3b;
}
.has-error .help-block,
-.has-error .control-label {
- color: #b94a48;
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline {
+ color: #a94442;
}
.has-error .form-control {
- border-color: #b94a48;
+ border-color: #a94442;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-error .form-control:focus {
- border-color: #953b39;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+ border-color: #843534;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
}
.has-error .input-group-addon {
- color: #b94a48;
+ color: #a94442;
background-color: #f2dede;
- border-color: #b94a48;
+ border-color: #a94442;
}
.has-success .help-block,
-.has-success .control-label {
- color: #468847;
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+ color: #3c763d;
}
.has-success .form-control {
- border-color: #468847;
+ border-color: #3c763d;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-success .form-control:focus {
- border-color: #356635;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+ border-color: #2b542c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
}
.has-success .input-group-addon {
- color: #468847;
+ color: #3c763d;
background-color: #dff0d8;
- border-color: #468847;
+ border-color: #3c763d;
}
.form-control-static {
- padding-top: 7px;
margin-bottom: 0;
}
@@ -1931,6 +2182,9 @@ textarea.input-lg {
.form-inline .form-control {
display: inline-block;
}
+ .form-inline select.form-control {
+ width: auto;
+ }
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
@@ -1955,6 +2209,11 @@ textarea.input-lg {
margin-bottom: 0;
}
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+ min-height: 27px;
+}
+
.form-horizontal .form-group {
margin-right: -15px;
margin-left: -15px;
@@ -1980,6 +2239,10 @@ textarea.input-lg {
clear: both;
}
+.form-horizontal .form-control-static {
+ padding-top: 7px;
+}
+
@media (min-width: 768px) {
.form-horizontal .control-label {
text-align: right;
@@ -1997,6 +2260,7 @@ textarea.input-lg {
white-space: nowrap;
vertical-align: middle;
cursor: pointer;
+ background-image: none;
border: 1px solid transparent;
border-radius: 4px;
-webkit-user-select: none;
@@ -2007,7 +2271,7 @@ textarea.input-lg {
}
.btn:focus {
- outline: thin dotted #333;
+ outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -2078,6 +2342,11 @@ fieldset[disabled] .btn-default.active {
border-color: #cccccc;
}
+.btn-default .badge {
+ color: #ffffff;
+ background-color: #fff;
+}
+
.btn-primary {
color: #ffffff;
background-color: #428bca;
@@ -2119,6 +2388,11 @@ fieldset[disabled] .btn-primary.active {
border-color: #357ebd;
}
+.btn-primary .badge {
+ color: #428bca;
+ background-color: #fff;
+}
+
.btn-warning {
color: #ffffff;
background-color: #f0ad4e;
@@ -2160,6 +2434,11 @@ fieldset[disabled] .btn-warning.active {
border-color: #eea236;
}
+.btn-warning .badge {
+ color: #f0ad4e;
+ background-color: #fff;
+}
+
.btn-danger {
color: #ffffff;
background-color: #d9534f;
@@ -2201,6 +2480,11 @@ fieldset[disabled] .btn-danger.active {
border-color: #d43f3a;
}
+.btn-danger .badge {
+ color: #d9534f;
+ background-color: #fff;
+}
+
.btn-success {
color: #ffffff;
background-color: #5cb85c;
@@ -2242,6 +2526,11 @@ fieldset[disabled] .btn-success.active {
border-color: #4cae4c;
}
+.btn-success .badge {
+ color: #5cb85c;
+ background-color: #fff;
+}
+
.btn-info {
color: #ffffff;
background-color: #5bc0de;
@@ -2283,6 +2572,11 @@ fieldset[disabled] .btn-info.active {
border-color: #46b8da;
}
+.btn-info .badge {
+ color: #5bc0de;
+ background-color: #fff;
+}
+
.btn-link {
font-weight: normal;
color: #428bca;
@@ -2328,8 +2622,7 @@ fieldset[disabled] .btn-link:focus {
border-radius: 6px;
}
-.btn-sm,
-.btn-xs {
+.btn-sm {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
@@ -2338,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
.btn-xs {
padding: 1px 5px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
}
.btn-block {
@@ -2398,6 +2694,11 @@ input[type="button"].btn-block {
font-style: normal;
font-weight: normal;
line-height: 1;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.glyphicon:empty {
+ width: 1em;
}
.glyphicon-asterisk:before {
@@ -2552,6 +2853,10 @@ input[type="button"].btn-block {
content: "\e032";
}
+.glyphicon-lock:before {
+ content: "\e033";
+}
+
.glyphicon-flag:before {
content: "\e034";
}
@@ -2592,10 +2897,18 @@ input[type="button"].btn-block {
content: "\e043";
}
+.glyphicon-bookmark:before {
+ content: "\e044";
+}
+
.glyphicon-print:before {
content: "\e045";
}
+.glyphicon-camera:before {
+ content: "\e046";
+}
+
.glyphicon-font:before {
content: "\e047";
}
@@ -2808,6 +3121,10 @@ input[type="button"].btn-block {
content: "\e103";
}
+.glyphicon-fire:before {
+ content: "\e104";
+}
+
.glyphicon-eye-open:before {
content: "\e105";
}
@@ -2824,6 +3141,10 @@ input[type="button"].btn-block {
content: "\e108";
}
+.glyphicon-calendar:before {
+ content: "\e109";
+}
+
.glyphicon-random:before {
content: "\e110";
}
@@ -2876,6 +3197,10 @@ input[type="button"].btn-block {
content: "\e122";
}
+.glyphicon-bell:before {
+ content: "\e123";
+}
+
.glyphicon-certificate:before {
content: "\e124";
}
@@ -2924,6 +3249,10 @@ input[type="button"].btn-block {
content: "\e135";
}
+.glyphicon-wrench:before {
+ content: "\e136";
+}
+
.glyphicon-tasks:before {
content: "\e137";
}
@@ -2932,6 +3261,10 @@ input[type="button"].btn-block {
content: "\e138";
}
+.glyphicon-briefcase:before {
+ content: "\e139";
+}
+
.glyphicon-fullscreen:before {
content: "\e140";
}
@@ -2940,6 +3273,10 @@ input[type="button"].btn-block {
content: "\e141";
}
+.glyphicon-paperclip:before {
+ content: "\e142";
+}
+
.glyphicon-heart-empty:before {
content: "\e143";
}
@@ -2952,6 +3289,10 @@ input[type="button"].btn-block {
content: "\e145";
}
+.glyphicon-pushpin:before {
+ content: "\e146";
+}
+
.glyphicon-usd:before {
content: "\e148";
}
@@ -3160,57 +3501,15 @@ input[type="button"].btn-block {
content: "\e200";
}
-.glyphicon-briefcase:before {
- content: "\1f4bc";
-}
-
-.glyphicon-calendar:before {
- content: "\1f4c5";
-}
-
-.glyphicon-pushpin:before {
- content: "\1f4cc";
-}
-
-.glyphicon-paperclip:before {
- content: "\1f4ce";
-}
-
-.glyphicon-camera:before {
- content: "\1f4f7";
-}
-
-.glyphicon-lock:before {
- content: "\1f512";
-}
-
-.glyphicon-bell:before {
- content: "\1f514";
-}
-
-.glyphicon-bookmark:before {
- content: "\1f516";
-}
-
-.glyphicon-fire:before {
- content: "\1f525";
-}
-
-.glyphicon-wrench:before {
- content: "\1f527";
-}
-
.caret {
display: inline-block;
width: 0;
height: 0;
margin-left: 2px;
vertical-align: middle;
- border-top: 4px solid #000000;
+ border-top: 4px solid;
border-right: 4px solid transparent;
- border-bottom: 0 dotted;
border-left: 4px solid transparent;
- content: "";
}
.dropdown {
@@ -3266,9 +3565,9 @@ input[type="button"].btn-block {
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
- color: #ffffff;
+ color: #262626;
text-decoration: none;
- background-color: #428bca;
+ background-color: #f5f5f5;
}
.dropdown-menu > .active > a,
@@ -3327,8 +3626,8 @@ input[type="button"].btn-block {
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
- border-top: 0 dotted;
- border-bottom: 4px solid #000000;
+ border-top: 0;
+ border-bottom: 4px solid;
content: "";
}
@@ -3346,30 +3645,6 @@ input[type="button"].btn-block {
}
}
-.btn-default .caret {
- border-top-color: #333333;
-}
-
-.btn-primary .caret,
-.btn-success .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret {
- border-top-color: #fff;
-}
-
-.dropup .btn-default .caret {
- border-bottom-color: #333333;
-}
-
-.dropup .btn-primary .caret,
-.dropup .btn-success .caret,
-.dropup .btn-warning .caret,
-.dropup .btn-danger .caret,
-.dropup .btn-info .caret {
- border-bottom-color: #fff;
-}
-
.btn-group,
.btn-group-vertical {
position: relative;
@@ -3481,7 +3756,6 @@ input[type="button"].btn-block {
}
.btn-group-xs > .btn {
- padding: 5px 10px;
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
@@ -3517,6 +3791,11 @@ input[type="button"].btn-block {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
+.btn-group.open .dropdown-toggle.btn-link {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
.btn .caret {
margin-left: 0;
}
@@ -3531,7 +3810,8 @@ input[type="button"].btn-block {
}
.btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group {
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
display: block;
float: none;
width: 100%;
@@ -3608,12 +3888,17 @@ input[type="button"].btn-block {
table-layout: fixed;
}
-.btn-group-justified .btn {
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
display: table-cell;
float: none;
width: 1%;
}
+.btn-group-justified > .btn-group .btn {
+ width: 100%;
+}
+
[data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none;
@@ -3625,7 +3910,7 @@ input[type="button"].btn-block {
border-collapse: separate;
}
-.input-group.col {
+.input-group[class*="col-"] {
float: none;
padding-right: 0;
padding-left: 0;
@@ -3639,7 +3924,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
- height: 45px;
+ height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
@@ -3649,8 +3934,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
- height: 45px;
- line-height: 45px;
+ height: 46px;
+ line-height: 46px;
}
textarea.input-group-lg > .form-control,
@@ -3706,6 +3991,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
font-size: 14px;
font-weight: normal;
line-height: 1;
+ color: #555555;
text-align: center;
background-color: #eeeeee;
border: 1px solid #cccccc;
@@ -3760,6 +4046,14 @@ textarea.input-group-sm > .input-group-btn > .btn {
white-space: nowrap;
}
+.input-group-btn:first-child > .btn {
+ margin-right: -1px;
+}
+
+.input-group-btn:last-child > .btn {
+ margin-left: -1px;
+}
+
.input-group-btn > .btn {
position: relative;
}
@@ -3886,23 +4180,46 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-tabs.nav-justified > li > a {
+ margin-bottom: 5px;
text-align: center;
}
+.nav-tabs.nav-justified > .dropdown .dropdown-menu {
+ top: auto;
+ left: auto;
+}
+
@media (min-width: 768px) {
.nav-tabs.nav-justified > li {
display: table-cell;
width: 1%;
}
+ .nav-tabs.nav-justified > li > a {
+ margin-bottom: 0;
+ }
}
.nav-tabs.nav-justified > li > a {
margin-right: 0;
- border-bottom: 1px solid #dddddd;
+ border-radius: 4px;
}
-.nav-tabs.nav-justified > .active > a {
- border-bottom-color: #ffffff;
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+ border: 1px solid #dddddd;
+}
+
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #dddddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs.nav-justified > .active > a,
+ .nav-tabs.nav-justified > .active > a:hover,
+ .nav-tabs.nav-justified > .active > a:focus {
+ border-bottom-color: #ffffff;
+ }
}
.nav-pills > li {
@@ -3910,7 +4227,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-pills > li > a {
- border-radius: 5px;
+ border-radius: 4px;
}
.nav-pills > li + li {
@@ -3942,14 +4259,23 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-justified > li > a {
+ margin-bottom: 5px;
text-align: center;
}
+.nav-justified > .dropdown .dropdown-menu {
+ top: auto;
+ left: auto;
+}
+
@media (min-width: 768px) {
.nav-justified > li {
display: table-cell;
width: 1%;
}
+ .nav-justified > li > a {
+ margin-bottom: 0;
+ }
}
.nav-tabs-justified {
@@ -3958,53 +4284,35 @@ textarea.input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > li > a {
margin-right: 0;
- border-bottom: 1px solid #dddddd;
-}
-
-.nav-tabs-justified > .active > a {
- border-bottom-color: #ffffff;
-}
-
-.tabbable:before,
-.tabbable:after {
- display: table;
- content: " ";
-}
-
-.tabbable:after {
- clear: both;
+ border-radius: 4px;
}
-.tabbable:before,
-.tabbable:after {
- display: table;
- content: " ";
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+ border: 1px solid #dddddd;
}
-.tabbable:after {
- clear: both;
+@media (min-width: 768px) {
+ .nav-tabs-justified > li > a {
+ border-bottom: 1px solid #dddddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs-justified > .active > a,
+ .nav-tabs-justified > .active > a:hover,
+ .nav-tabs-justified > .active > a:focus {
+ border-bottom-color: #ffffff;
+ }
}
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
+.tab-content > .tab-pane {
display: none;
}
-.tab-content > .active,
-.pill-content > .active {
+.tab-content > .active {
display: block;
}
-.nav .caret {
- border-top-color: #428bca;
- border-bottom-color: #428bca;
-}
-
-.nav a:hover .caret {
- border-top-color: #2a6496;
- border-bottom-color: #2a6496;
-}
-
.nav-tabs .dropdown-menu {
margin-top: -1px;
border-top-right-radius: 0;
@@ -4013,7 +4321,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar {
position: relative;
- z-index: 1000;
min-height: 50px;
margin-bottom: 20px;
border: 1px solid transparent;
@@ -4120,14 +4427,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-collapse.in {
overflow-y: visible;
}
- .navbar-collapse .navbar-nav.navbar-left:first-child {
- margin-left: -15px;
- }
- .navbar-collapse .navbar-nav.navbar-right:last-child {
- margin-right: -15px;
- }
- .navbar-collapse .navbar-text:last-child {
- margin-right: 0;
+ .navbar-fixed-top .navbar-collapse,
+ .navbar-static-top .navbar-collapse,
+ .navbar-fixed-bottom .navbar-collapse {
+ padding-right: 0;
+ padding-left: 0;
}
}
@@ -4146,6 +4450,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-static-top {
+ z-index: 1000;
border-width: 0 0 1px;
}
@@ -4160,7 +4465,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed;
right: 0;
left: 0;
- border-width: 0 0 1px;
+ z-index: 1030;
}
@media (min-width: 768px) {
@@ -4172,12 +4477,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top {
top: 0;
- z-index: 1030;
+ border-width: 0 0 1px;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0;
+ border-width: 1px 0 0;
}
.navbar-brand {
@@ -4206,6 +4512,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-right: 15px;
margin-bottom: 8px;
background-color: transparent;
+ background-image: none;
border: 1px solid transparent;
border-radius: 4px;
}
@@ -4272,6 +4579,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
padding-top: 15px;
padding-bottom: 15px;
}
+ .navbar-nav.navbar-right:last-child {
+ margin-right: -15px;
+ }
}
@media (min-width: 768px) {
@@ -4304,6 +4614,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-form .form-control {
display: inline-block;
}
+ .navbar-form select.form-control {
+ width: auto;
+ }
.navbar-form .radio,
.navbar-form .checkbox {
display: inline-block;
@@ -4335,6 +4648,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
-webkit-box-shadow: none;
box-shadow: none;
}
+ .navbar-form.navbar-right:last-child {
+ margin-right: -15px;
+ }
}
.navbar-nav > li > .dropdown-menu {
@@ -4359,17 +4675,30 @@ textarea.input-group-sm > .input-group-btn > .btn {
margin-bottom: 8px;
}
+.navbar-btn.btn-sm {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+.navbar-btn.btn-xs {
+ margin-top: 14px;
+ margin-bottom: 14px;
+}
+
.navbar-text {
- float: left;
margin-top: 15px;
margin-bottom: 15px;
}
@media (min-width: 768px) {
.navbar-text {
+ float: left;
margin-right: 15px;
margin-left: 15px;
}
+ .navbar-text.navbar-right:last-child {
+ margin-right: 0;
+ }
}
.navbar-default {
@@ -4430,13 +4759,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-collapse,
.navbar-default .navbar-form {
- border-color: #e6e6e6;
-}
-
-.navbar-default .navbar-nav > .dropdown > a:hover .caret,
-.navbar-default .navbar-nav > .dropdown > a:focus .caret {
- border-top-color: #333333;
- border-bottom-color: #333333;
+ border-color: #e7e7e7;
}
.navbar-default .navbar-nav > .open > a,
@@ -4446,18 +4769,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
background-color: #e7e7e7;
}
-.navbar-default .navbar-nav > .open > a .caret,
-.navbar-default .navbar-nav > .open > a:hover .caret,
-.navbar-default .navbar-nav > .open > a:focus .caret {
- border-top-color: #555555;
- border-bottom-color: #555555;
-}
-
-.navbar-default .navbar-nav > .dropdown > a .caret {
- border-top-color: #777777;
- border-bottom-color: #777777;
-}
-
@media (max-width: 767px) {
.navbar-default .navbar-nav .open .dropdown-menu > li > a {
color: #777777;
@@ -4546,38 +4857,24 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-inverse .navbar-collapse,
-.navbar-inverse .navbar-form {
- border-color: #101010;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
- color: #ffffff;
- background-color: #080808;
-}
-
-.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
- border-top-color: #ffffff;
- border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-nav > .dropdown > a .caret {
- border-top-color: #999999;
- border-bottom-color: #999999;
+.navbar-inverse .navbar-form {
+ border-color: #101010;
}
-.navbar-inverse .navbar-nav > .open > a .caret,
-.navbar-inverse .navbar-nav > .open > a:hover .caret,
-.navbar-inverse .navbar-nav > .open > a:focus .caret {
- border-top-color: #ffffff;
- border-bottom-color: #ffffff;
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+ color: #ffffff;
+ background-color: #080808;
}
@media (max-width: 767px) {
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
border-color: #080808;
}
+ .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+ background-color: #080808;
+ }
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
color: #999999;
}
@@ -4687,6 +4984,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
@@ -4821,6 +5120,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: none;
}
+.btn .label {
+ position: relative;
+ top: -1px;
+}
+
.label-default {
background-color: #999999;
}
@@ -4894,6 +5198,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: none;
}
+.btn .badge {
+ position: relative;
+ top: -1px;
+}
+
a.badge:hover,
a.badge:focus {
color: #ffffff;
@@ -4901,11 +5210,6 @@ a.badge:focus {
cursor: pointer;
}
-.btn .badge {
- position: relative;
- top: -1px;
-}
-
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #428bca;
@@ -4926,7 +5230,8 @@ a.list-group-item.active > .badge,
background-color: #eeeeee;
}
-.jumbotron h1 {
+.jumbotron h1,
+.jumbotron .h1 {
line-height: 1;
color: inherit;
}
@@ -4939,6 +5244,10 @@ a.list-group-item.active > .badge,
border-radius: 6px;
}
+.jumbotron .container {
+ max-width: 100%;
+}
+
@media screen and (min-width: 768px) {
.jumbotron {
padding-top: 48px;
@@ -4948,17 +5257,16 @@ a.list-group-item.active > .badge,
padding-right: 60px;
padding-left: 60px;
}
- .jumbotron h1 {
+ .jumbotron h1,
+ .jumbotron .h1 {
font-size: 63px;
}
}
.thumbnail {
- display: inline-block;
display: block;
- height: auto;
- max-width: 100%;
padding: 4px;
+ margin-bottom: 20px;
line-height: 1.428571429;
background-color: #ffffff;
border: 1px solid #dddddd;
@@ -4967,22 +5275,21 @@ a.list-group-item.active > .badge,
transition: all 0.2s ease-in-out;
}
-.thumbnail > img {
+.thumbnail > img,
+.thumbnail a > img {
display: block;
height: auto;
max-width: 100%;
+ margin-right: auto;
+ margin-left: auto;
}
a.thumbnail:hover,
-a.thumbnail:focus {
+a.thumbnail:focus,
+a.thumbnail.active {
border-color: #428bca;
}
-.thumbnail > img {
- margin-right: auto;
- margin-left: auto;
-}
-
.thumbnail .caption {
padding: 9px;
color: #333333;
@@ -5025,7 +5332,7 @@ a.thumbnail:focus {
}
.alert-success {
- color: #468847;
+ color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@@ -5035,11 +5342,11 @@ a.thumbnail:focus {
}
.alert-success .alert-link {
- color: #356635;
+ color: #2b542c;
}
.alert-info {
- color: #3a87ad;
+ color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@@ -5049,35 +5356,35 @@ a.thumbnail:focus {
}
.alert-info .alert-link {
- color: #2d6987;
+ color: #245269;
}
.alert-warning {
- color: #c09853;
+ color: #8a6d3b;
background-color: #fcf8e3;
- border-color: #fbeed5;
+ border-color: #faebcc;
}
.alert-warning hr {
- border-top-color: #f8e5be;
+ border-top-color: #f7e1b5;
}
.alert-warning .alert-link {
- color: #a47e3c;
+ color: #66512c;
}
.alert-danger {
- color: #b94a48;
+ color: #a94442;
background-color: #f2dede;
- border-color: #eed3d7;
+ border-color: #ebccd1;
}
.alert-danger hr {
- border-top-color: #e6c1c7;
+ border-top-color: #e4b9c0;
}
.alert-danger .alert-link {
- color: #953b39;
+ color: #843534;
}
@-webkit-keyframes progress-bar-stripes {
@@ -5089,24 +5396,6 @@ a.thumbnail:focus {
}
}
-@-moz-keyframes progress-bar-stripes {
- from {
- background-position: 40px 0;
- }
- to {
- background-position: 0 0;
- }
-}
-
-@-o-keyframes progress-bar-stripes {
- from {
- background-position: 0 0;
- }
- to {
- background-position: 40px 0;
- }
-}
-
@keyframes progress-bar-stripes {
from {
background-position: 40px 0;
@@ -5131,6 +5420,7 @@ a.thumbnail:focus {
width: 0;
height: 100%;
font-size: 12px;
+ line-height: 20px;
color: #ffffff;
text-align: center;
background-color: #428bca;
@@ -5141,18 +5431,13 @@ a.thumbnail:focus {
}
.progress-striped .progress-bar {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-size: 40px 40px;
}
.progress.active .progress-bar {
-webkit-animation: progress-bar-stripes 2s linear infinite;
- -moz-animation: progress-bar-stripes 2s linear infinite;
- -ms-animation: progress-bar-stripes 2s linear infinite;
- -o-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
@@ -5161,9 +5446,7 @@ a.thumbnail:focus {
}
.progress-striped .progress-bar-success {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
@@ -5172,9 +5455,7 @@ a.thumbnail:focus {
}
.progress-striped .progress-bar-info {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
@@ -5183,9 +5464,7 @@ a.thumbnail:focus {
}
.progress-striped .progress-bar-warning {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
@@ -5194,9 +5473,7 @@ a.thumbnail:focus {
}
.progress-striped .progress-bar-danger {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
@@ -5283,24 +5560,24 @@ a.list-group-item:focus {
background-color: #f5f5f5;
}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
z-index: 2;
color: #ffffff;
background-color: #428bca;
border-color: #428bca;
}
-.list-group-item.active .list-group-item-heading,
-.list-group-item.active:hover .list-group-item-heading,
-.list-group-item.active:focus .list-group-item-heading {
+a.list-group-item.active .list-group-item-heading,
+a.list-group-item.active:hover .list-group-item-heading,
+a.list-group-item.active:focus .list-group-item-heading {
color: inherit;
}
-.list-group-item.active .list-group-item-text,
-.list-group-item.active:hover .list-group-item-text,
-.list-group-item.active:focus .list-group-item-text {
+a.list-group-item.active .list-group-item-text,
+a.list-group-item.active:hover .list-group-item-text,
+a.list-group-item.active:focus .list-group-item-text {
color: #e1edf7;
}
@@ -5368,14 +5645,76 @@ a.list-group-item:focus {
border-top-width: 0;
}
-.panel > .table {
+.panel > .table,
+.panel > .table-responsive > .table {
margin-bottom: 0;
}
-.panel > .panel-body + .table {
+.panel > .panel-body + .table,
+.panel > .panel-body + .table-responsive {
border-top: 1px solid #dddddd;
}
+.panel > .table > tbody:first-child th,
+.panel > .table > tbody:first-child td {
+ border-top: 0;
+}
+
+.panel > .table-bordered,
+.panel > .table-responsive > .table-bordered {
+ border: 0;
+}
+
+.panel > .table-bordered > thead > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+.panel > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-bordered > thead > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+.panel > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-bordered > tfoot > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+ border-left: 0;
+}
+
+.panel > .table-bordered > thead > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+.panel > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-bordered > thead > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+.panel > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-bordered > tfoot > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+ border-right: 0;
+}
+
+.panel > .table-bordered > thead > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
+.panel > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-bordered > thead > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:last-child > td,
+.panel > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+ border-bottom: 0;
+}
+
+.panel > .table-responsive {
+ margin-bottom: 0;
+ border: 0;
+}
+
.panel-heading {
padding: 10px 15px;
border-bottom: 1px solid transparent;
@@ -5383,10 +5722,15 @@ a.list-group-item:focus {
border-top-left-radius: 3px;
}
+.panel-heading > .dropdown .dropdown-toggle {
+ color: inherit;
+}
+
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: 16px;
+ color: inherit;
}
.panel-title > a {
@@ -5468,7 +5812,7 @@ a.list-group-item:focus {
}
.panel-success > .panel-heading {
- color: #468847;
+ color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
@@ -5482,39 +5826,39 @@ a.list-group-item:focus {
}
.panel-warning {
- border-color: #fbeed5;
+ border-color: #faebcc;
}
.panel-warning > .panel-heading {
- color: #c09853;
+ color: #8a6d3b;
background-color: #fcf8e3;
- border-color: #fbeed5;
+ border-color: #faebcc;
}
.panel-warning > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #fbeed5;
+ border-top-color: #faebcc;
}
.panel-warning > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #fbeed5;
+ border-bottom-color: #faebcc;
}
.panel-danger {
- border-color: #eed3d7;
+ border-color: #ebccd1;
}
.panel-danger > .panel-heading {
- color: #b94a48;
+ color: #a94442;
background-color: #f2dede;
- border-color: #eed3d7;
+ border-color: #ebccd1;
}
.panel-danger > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #eed3d7;
+ border-top-color: #ebccd1;
}
.panel-danger > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #eed3d7;
+ border-bottom-color: #ebccd1;
}
.panel-info {
@@ -5522,7 +5866,7 @@ a.list-group-item:focus {
}
.panel-info > .panel-heading {
- color: #3a87ad;
+ color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
@@ -5593,12 +5937,6 @@ button.close {
overflow: hidden;
}
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
- margin-right: 15px;
-}
-
.modal {
position: fixed;
top: 0;
@@ -5628,11 +5966,10 @@ body.modal-open,
}
.modal-dialog {
+ position: relative;
z-index: 1050;
width: auto;
- padding: 10px;
- margin-right: auto;
- margin-left: auto;
+ margin: 10px;
}
.modal-content {
@@ -5729,11 +6066,8 @@ body.modal-open,
@media screen and (min-width: 768px) {
.modal-dialog {
- right: auto;
- left: 50%;
width: 600px;
- padding-top: 30px;
- padding-bottom: 30px;
+ margin: 30px auto;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
@@ -6070,9 +6404,7 @@ body.modal-open,
}
.carousel-control.left {
- background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001)));
background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%));
- background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
@@ -6081,9 +6413,7 @@ body.modal-open,
.carousel-control.right {
right: 0;
left: auto;
- background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5)));
background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%));
- background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
@@ -6093,6 +6423,7 @@ body.modal-open,
.carousel-control:focus {
color: #ffffff;
text-decoration: none;
+ outline: none;
opacity: 0.9;
filter: alpha(opacity=90);
}
@@ -6103,12 +6434,21 @@ body.modal-open,
.carousel-control .glyphicon-chevron-right {
position: absolute;
top: 50%;
- left: 50%;
z-index: 5;
display: inline-block;
}
.carousel-control .icon-prev,
+.carousel-control .glyphicon-chevron-left {
+ left: 50%;
+}
+
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-right {
+ right: 50%;
+}
+
+.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 20px;
height: 20px;
@@ -6144,6 +6484,8 @@ body.modal-open,
margin: 1px;
text-indent: -999px;
cursor: pointer;
+ background-color: #000 \9;
+ background-color: rgba(0, 0, 0, 0);
border: 1px solid #ffffff;
border-radius: 10px;
}
@@ -6173,6 +6515,8 @@ body.modal-open,
}
@media screen and (min-width: 768px) {
+ .carousel-control .glyphicons-chevron-left,
+ .carousel-control .glyphicons-chevron-right,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
@@ -6201,6 +6545,12 @@ body.modal-open,
clear: both;
}
+.center-block {
+ display: block;
+ margin-right: auto;
+ margin-left: auto;
+}
+
.pull-right {
float: right !important;
}
@@ -6229,33 +6579,21 @@ body.modal-open,
border: 0;
}
-.affix {
- position: fixed;
-}
-
-@-ms-viewport {
- width: device-width;
-}
-
-@media screen and (max-width: 400px) {
- @-ms-viewport {
- width: 320px;
- }
-}
-
.hidden {
display: none !important;
visibility: hidden !important;
}
-.visible-xs {
- display: none !important;
+.affix {
+ position: fixed;
}
-tr.visible-xs {
- display: none !important;
+@-ms-viewport {
+ width: device-width;
}
+.visible-xs,
+tr.visible-xs,
th.visible-xs,
td.visible-xs {
display: none !important;
@@ -6265,6 +6603,9 @@ td.visible-xs {
.visible-xs {
display: block !important;
}
+ table.visible-xs {
+ display: table;
+ }
tr.visible-xs {
display: table-row !important;
}
@@ -6278,6 +6619,9 @@ td.visible-xs {
.visible-xs.visible-sm {
display: block !important;
}
+ table.visible-xs.visible-sm {
+ display: table;
+ }
tr.visible-xs.visible-sm {
display: table-row !important;
}
@@ -6291,6 +6635,9 @@ td.visible-xs {
.visible-xs.visible-md {
display: block !important;
}
+ table.visible-xs.visible-md {
+ display: table;
+ }
tr.visible-xs.visible-md {
display: table-row !important;
}
@@ -6304,6 +6651,9 @@ td.visible-xs {
.visible-xs.visible-lg {
display: block !important;
}
+ table.visible-xs.visible-lg {
+ display: table;
+ }
tr.visible-xs.visible-lg {
display: table-row !important;
}
@@ -6313,14 +6663,8 @@ td.visible-xs {
}
}
-.visible-sm {
- display: none !important;
-}
-
-tr.visible-sm {
- display: none !important;
-}
-
+.visible-sm,
+tr.visible-sm,
th.visible-sm,
td.visible-sm {
display: none !important;
@@ -6330,6 +6674,9 @@ td.visible-sm {
.visible-sm.visible-xs {
display: block !important;
}
+ table.visible-sm.visible-xs {
+ display: table;
+ }
tr.visible-sm.visible-xs {
display: table-row !important;
}
@@ -6343,6 +6690,9 @@ td.visible-sm {
.visible-sm {
display: block !important;
}
+ table.visible-sm {
+ display: table;
+ }
tr.visible-sm {
display: table-row !important;
}
@@ -6356,6 +6706,9 @@ td.visible-sm {
.visible-sm.visible-md {
display: block !important;
}
+ table.visible-sm.visible-md {
+ display: table;
+ }
tr.visible-sm.visible-md {
display: table-row !important;
}
@@ -6369,6 +6722,9 @@ td.visible-sm {
.visible-sm.visible-lg {
display: block !important;
}
+ table.visible-sm.visible-lg {
+ display: table;
+ }
tr.visible-sm.visible-lg {
display: table-row !important;
}
@@ -6378,14 +6734,8 @@ td.visible-sm {
}
}
-.visible-md {
- display: none !important;
-}
-
-tr.visible-md {
- display: none !important;
-}
-
+.visible-md,
+tr.visible-md,
th.visible-md,
td.visible-md {
display: none !important;
@@ -6395,6 +6745,9 @@ td.visible-md {
.visible-md.visible-xs {
display: block !important;
}
+ table.visible-md.visible-xs {
+ display: table;
+ }
tr.visible-md.visible-xs {
display: table-row !important;
}
@@ -6408,6 +6761,9 @@ td.visible-md {
.visible-md.visible-sm {
display: block !important;
}
+ table.visible-md.visible-sm {
+ display: table;
+ }
tr.visible-md.visible-sm {
display: table-row !important;
}
@@ -6421,6 +6777,9 @@ td.visible-md {
.visible-md {
display: block !important;
}
+ table.visible-md {
+ display: table;
+ }
tr.visible-md {
display: table-row !important;
}
@@ -6434,6 +6793,9 @@ td.visible-md {
.visible-md.visible-lg {
display: block !important;
}
+ table.visible-md.visible-lg {
+ display: table;
+ }
tr.visible-md.visible-lg {
display: table-row !important;
}
@@ -6443,14 +6805,8 @@ td.visible-md {
}
}
-.visible-lg {
- display: none !important;
-}
-
-tr.visible-lg {
- display: none !important;
-}
-
+.visible-lg,
+tr.visible-lg,
th.visible-lg,
td.visible-lg {
display: none !important;
@@ -6460,6 +6816,9 @@ td.visible-lg {
.visible-lg.visible-xs {
display: block !important;
}
+ table.visible-lg.visible-xs {
+ display: table;
+ }
tr.visible-lg.visible-xs {
display: table-row !important;
}
@@ -6473,6 +6832,9 @@ td.visible-lg {
.visible-lg.visible-sm {
display: block !important;
}
+ table.visible-lg.visible-sm {
+ display: table;
+ }
tr.visible-lg.visible-sm {
display: table-row !important;
}
@@ -6486,6 +6848,9 @@ td.visible-lg {
.visible-lg.visible-md {
display: block !important;
}
+ table.visible-lg.visible-md {
+ display: table;
+ }
tr.visible-lg.visible-md {
display: table-row !important;
}
@@ -6499,6 +6864,9 @@ td.visible-lg {
.visible-lg {
display: block !important;
}
+ table.visible-lg {
+ display: table;
+ }
tr.visible-lg {
display: table-row !important;
}
@@ -6512,6 +6880,10 @@ td.visible-lg {
display: block !important;
}
+table.hidden-xs {
+ display: table;
+}
+
tr.hidden-xs {
display: table-row !important;
}
@@ -6522,12 +6894,8 @@ td.hidden-xs {
}
@media (max-width: 767px) {
- .hidden-xs {
- display: none !important;
- }
- tr.hidden-xs {
- display: none !important;
- }
+ .hidden-xs,
+ tr.hidden-xs,
th.hidden-xs,
td.hidden-xs {
display: none !important;
@@ -6535,12 +6903,8 @@ td.hidden-xs {
}
@media (min-width: 768px) and (max-width: 991px) {
- .hidden-xs.hidden-sm {
- display: none !important;
- }
- tr.hidden-xs.hidden-sm {
- display: none !important;
- }
+ .hidden-xs.hidden-sm,
+ tr.hidden-xs.hidden-sm,
th.hidden-xs.hidden-sm,
td.hidden-xs.hidden-sm {
display: none !important;
@@ -6548,12 +6912,8 @@ td.hidden-xs {
}
@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-xs.hidden-md {
- display: none !important;
- }
- tr.hidden-xs.hidden-md {
- display: none !important;
- }
+ .hidden-xs.hidden-md,
+ tr.hidden-xs.hidden-md,
th.hidden-xs.hidden-md,
td.hidden-xs.hidden-md {
display: none !important;
@@ -6561,12 +6921,8 @@ td.hidden-xs {
}
@media (min-width: 1200px) {
- .hidden-xs.hidden-lg {
- display: none !important;
- }
- tr.hidden-xs.hidden-lg {
- display: none !important;
- }
+ .hidden-xs.hidden-lg,
+ tr.hidden-xs.hidden-lg,
th.hidden-xs.hidden-lg,
td.hidden-xs.hidden-lg {
display: none !important;
@@ -6577,6 +6933,10 @@ td.hidden-xs {
display: block !important;
}
+table.hidden-sm {
+ display: table;
+}
+
tr.hidden-sm {
display: table-row !important;
}
@@ -6587,12 +6947,8 @@ td.hidden-sm {
}
@media (max-width: 767px) {
- .hidden-sm.hidden-xs {
- display: none !important;
- }
- tr.hidden-sm.hidden-xs {
- display: none !important;
- }
+ .hidden-sm.hidden-xs,
+ tr.hidden-sm.hidden-xs,
th.hidden-sm.hidden-xs,
td.hidden-sm.hidden-xs {
display: none !important;
@@ -6600,12 +6956,8 @@ td.hidden-sm {
}
@media (min-width: 768px) and (max-width: 991px) {
- .hidden-sm {
- display: none !important;
- }
- tr.hidden-sm {
- display: none !important;
- }
+ .hidden-sm,
+ tr.hidden-sm,
th.hidden-sm,
td.hidden-sm {
display: none !important;
@@ -6613,12 +6965,8 @@ td.hidden-sm {
}
@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-sm.hidden-md {
- display: none !important;
- }
- tr.hidden-sm.hidden-md {
- display: none !important;
- }
+ .hidden-sm.hidden-md,
+ tr.hidden-sm.hidden-md,
th.hidden-sm.hidden-md,
td.hidden-sm.hidden-md {
display: none !important;
@@ -6626,12 +6974,8 @@ td.hidden-sm {
}
@media (min-width: 1200px) {
- .hidden-sm.hidden-lg {
- display: none !important;
- }
- tr.hidden-sm.hidden-lg {
- display: none !important;
- }
+ .hidden-sm.hidden-lg,
+ tr.hidden-sm.hidden-lg,
th.hidden-sm.hidden-lg,
td.hidden-sm.hidden-lg {
display: none !important;
@@ -6642,6 +6986,10 @@ td.hidden-sm {
display: block !important;
}
+table.hidden-md {
+ display: table;
+}
+
tr.hidden-md {
display: table-row !important;
}
@@ -6652,12 +7000,8 @@ td.hidden-md {
}
@media (max-width: 767px) {
- .hidden-md.hidden-xs {
- display: none !important;
- }
- tr.hidden-md.hidden-xs {
- display: none !important;
- }
+ .hidden-md.hidden-xs,
+ tr.hidden-md.hidden-xs,
th.hidden-md.hidden-xs,
td.hidden-md.hidden-xs {
display: none !important;
@@ -6665,12 +7009,8 @@ td.hidden-md {
}
@media (min-width: 768px) and (max-width: 991px) {
- .hidden-md.hidden-sm {
- display: none !important;
- }
- tr.hidden-md.hidden-sm {
- display: none !important;
- }
+ .hidden-md.hidden-sm,
+ tr.hidden-md.hidden-sm,
th.hidden-md.hidden-sm,
td.hidden-md.hidden-sm {
display: none !important;
@@ -6678,12 +7018,8 @@ td.hidden-md {
}
@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-md {
- display: none !important;
- }
- tr.hidden-md {
- display: none !important;
- }
+ .hidden-md,
+ tr.hidden-md,
th.hidden-md,
td.hidden-md {
display: none !important;
@@ -6691,12 +7027,8 @@ td.hidden-md {
}
@media (min-width: 1200px) {
- .hidden-md.hidden-lg {
- display: none !important;
- }
- tr.hidden-md.hidden-lg {
- display: none !important;
- }
+ .hidden-md.hidden-lg,
+ tr.hidden-md.hidden-lg,
th.hidden-md.hidden-lg,
td.hidden-md.hidden-lg {
display: none !important;
@@ -6707,6 +7039,10 @@ td.hidden-md {
display: block !important;
}
+table.hidden-lg {
+ display: table;
+}
+
tr.hidden-lg {
display: table-row !important;
}
@@ -6717,12 +7053,8 @@ td.hidden-lg {
}
@media (max-width: 767px) {
- .hidden-lg.hidden-xs {
- display: none !important;
- }
- tr.hidden-lg.hidden-xs {
- display: none !important;
- }
+ .hidden-lg.hidden-xs,
+ tr.hidden-lg.hidden-xs,
th.hidden-lg.hidden-xs,
td.hidden-lg.hidden-xs {
display: none !important;
@@ -6730,12 +7062,8 @@ td.hidden-lg {
}
@media (min-width: 768px) and (max-width: 991px) {
- .hidden-lg.hidden-sm {
- display: none !important;
- }
- tr.hidden-lg.hidden-sm {
- display: none !important;
- }
+ .hidden-lg.hidden-sm,
+ tr.hidden-lg.hidden-sm,
th.hidden-lg.hidden-sm,
td.hidden-lg.hidden-sm {
display: none !important;
@@ -6743,12 +7071,8 @@ td.hidden-lg {
}
@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-lg.hidden-md {
- display: none !important;
- }
- tr.hidden-lg.hidden-md {
- display: none !important;
- }
+ .hidden-lg.hidden-md,
+ tr.hidden-lg.hidden-md,
th.hidden-lg.hidden-md,
td.hidden-lg.hidden-md {
display: none !important;
@@ -6756,26 +7080,16 @@ td.hidden-lg {
}
@media (min-width: 1200px) {
- .hidden-lg {
- display: none !important;
- }
- tr.hidden-lg {
- display: none !important;
- }
+ .hidden-lg,
+ tr.hidden-lg,
th.hidden-lg,
td.hidden-lg {
display: none !important;
}
}
-.visible-print {
- display: none !important;
-}
-
-tr.visible-print {
- display: none !important;
-}
-
+.visible-print,
+tr.visible-print,
th.visible-print,
td.visible-print {
display: none !important;
@@ -6785,6 +7099,9 @@ td.visible-print {
.visible-print {
display: block !important;
}
+ table.visible-print {
+ display: table;
+ }
tr.visible-print {
display: table-row !important;
}
@@ -6792,12 +7109,8 @@ td.visible-print {
td.visible-print {
display: table-cell !important;
}
- .hidden-print {
- display: none !important;
- }
- tr.hidden-print {
- display: none !important;
- }
+ .hidden-print,
+ tr.hidden-print,
th.hidden-print,
td.hidden-print {
display: none !important;