fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16284] Stable: Merge 16279:16283 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [16284] Stable: Merge 16279:16283 from trunk
Date: Wed, 8 Feb 2017 13:30:24 -0500 (EST)

Revision: 16284
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16284
Author:   sigurdne
Date:     2017-02-08 13:30:24 -0500 (Wed, 08 Feb 2017)
Log Message:
-----------
Stable: Merge 16279:16283 from trunk

Modified Paths:
--------------
    
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
    
branches/Version-2_0-branch/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
    branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
    branches/Version-2_0-branch/phpgwapi/setup/tables_current.inc.php
    branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
    branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
    branches/Version-2_0-branch/property/setup/tables_current.inc.php
    branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
    branches/Version-2_0-branch/registration/templates/base/config.tpl
    branches/Version-2_0-branch/registration/templates/base/fields.tpl
    branches/Version-2_0-branch/registration/templates/base/layout.tpl
    branches/Version-2_0-branch/registration/templates/base/lostpw_select.tpl
    branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
    branches/Version-2_0-branch/registration/templates/base/tos.tpl

Added Paths:
-----------
    branches/Version-2_0-branch/eventplannerfrontend/templates/base/css/
    
branches/Version-2_0-branch/registration/templates/base/css/rainbow_baby-blue.css

Removed Paths:
-------------
    branches/Version-2_0-branch/eventplannerfrontend/css/

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch 2017-02-08 18:30:24 UTC (rev 16284)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16188
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283
\ No newline at end of property
Modified: 
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php
===================================================================
--- 
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php  
    2017-02-08 18:18:09 UTC (rev 16283)
+++ 
branches/Version-2_0-branch/eventplannerfrontend/inc/class.hook_helper.inc.php  
    2017-02-08 18:30:24 UTC (rev 16284)
@@ -171,19 +171,22 @@
                                $message = 'Velg organisasjon';
 
                                $org_select = <<<HTML
-                               <p>
+                               
                                        <label for="org_id">Velg 
Organisasjon:</label>
                                        <select name="session_org_id" 
id="org_id" onChange="this.form.submit();">
                                                {$org_option}
                                        </select>
-                               </p>
+                               
 HTML;
                        }
 
                        $html = <<<HTML
-                       <form action="{$action}" method="POST">
-                               $org_select
-                       </form>
+
+                       <div id="organsation_select">
+                               <form action="{$action}" method="POST">
+                                       $org_select
+                               </form>
+                       </div>
 HTML;
 
                        echo $html;

Modified: 
branches/Version-2_0-branch/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
--- 
branches/Version-2_0-branch/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
      2017-02-08 18:18:09 UTC (rev 16283)
+++ 
branches/Version-2_0-branch/eventplannerfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
      2017-02-08 18:30:24 UTC (rev 16284)
@@ -90,7 +90,7 @@
                        try
                        {
                                $action = "";
-               //              $response = $client->__doRequest($request, 
$location_URL, $action, 1);
+                               $response = $client->__doRequest($request, 
$location_URL, $action, 1);
                                $reader = new XMLReader();
                                $reader->xml($response);
 

Modified: branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php    2017-02-08 
18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/phpgwapi/setup/setup.inc.php    2017-02-08 
18:30:24 UTC (rev 16284)
@@ -12,7 +12,7 @@
        // Basic information about this app
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
        $setup_info['phpgwapi']['title']     = 'phpgwapi';
-       $setup_info['phpgwapi']['version']   = '0.9.17.554';
+       $setup_info['phpgwapi']['version']   = '0.9.17.555';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.31';
        $setup_info['phpgwapi']['versions']['system'] = '2.0';
        $setup_info['phpgwapi']['enable']    = 3;

Modified: branches/Version-2_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/tables_current.inc.php   
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/phpgwapi/setup/tables_current.inc.php   
2017-02-08 18:30:24 UTC (rev 16284)
@@ -53,7 +53,7 @@
                'phpgw_accounts' => array(
                        'fd' => array(
                                'account_id' => array('type' => 
'auto','nullable' => False),
-                               'account_lid' => array('type' => 
'varchar','precision' => 25,'nullable' => False),
+                               'account_lid' => array('type' => 
'varchar','precision' => 100,'nullable' => False),
                                'account_pwd' => array('type' => 
'varchar','precision' => 115,'nullable' => False),
                                'account_firstname' => array('type' => 
'varchar','precision' => 50,'nullable' => False),
                                'account_lastname' => array('type' => 
'varchar','precision' => 50,'nullable' => False),
@@ -251,7 +251,7 @@
                                'log_id' => array('type' => 'auto','precision' 
=> 4,'nullable' => False),
                                'log_date' => array('type' => 
'timestamp','nullable' => False),
                                'log_account_id' => array('type' => 
'int','precision' => 4,'nullable' => False),
-                               'log_account_lid' => array('type' => 
'varchar','precision' => 25,'nullable' => False),
+                               'log_account_lid' => array('type' => 
'varchar','precision' => 100,'nullable' => False),
                                'log_app' => array('type' => 
'varchar','precision' => 25,'nullable' => False),
                                'log_severity' => array('type' => 
'char','precision' => 2,'nullable' => False),
                                'log_file' => array('type' => 
'varchar','precision' => 255,'nullable' => False,'default' => ''),
@@ -677,7 +677,7 @@
                                'auth_type' => array('type' => 
'varchar','precision' => 25,'nullable' => False),
                                'status' => array('type' => 'char','precision' 
=> 1,'nullable' => False,'default' => 'A'),
                                'location' => array('type' => 
'varchar','precision' => 200,'nullable' => False),
-                               'account_lid' => array('type' => 
'varchar','precision' => 25,'nullable' => False)
+                               'account_lid' => array('type' => 
'varchar','precision' => 100,'nullable' => False)
                        ),
                        'pk' => array('ext_user','location','auth_type'),
                        'fk' => array(),

Modified: branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php    
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/phpgwapi/setup/tables_update.inc.php    
2017-02-08 18:30:24 UTC (rev 16284)
@@ -3487,3 +3487,36 @@
                        return $GLOBALS['setup_info']['phpgwapi']['currentver'];
                }
        }
+
+       $test[] = '0.9.17.554';
+       /**
+       * Make room for email as account_lid
+       * @return string the new version number
+       */
+       function phpgwapi_upgrade0_9_17_554()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_mapping', 
'account_lid', array(
+                       'type' => 'varchar',
+                       'precision' => 100,
+                       'nullable' => false
+               ));
+
+               $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_accounts', 
'account_lid', array(
+                       'type' => 'varchar',
+                       'precision' => 100,
+                       'nullable' => false
+               ));
+               $GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_log', 
'log_account_lid', array(
+                       'type' => 'varchar',
+                       'precision' => 100,
+                       'nullable' => false
+               ));
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['phpgwapi']['currentver'] = 
'0.9.17.555';
+                       return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+               }
+       }

Modified: branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php        
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/head.inc.php        
2017-02-08 18:30:24 UTC (rev 16284)
@@ -68,7 +68,7 @@
        }
 
        $stylesheets[] = 
"/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css";
-//     $stylesheets[] = "/{$app}/templates/base/css/base.css";
+       $stylesheets[] = "/{$app}/templates/base/css/base.css";
 //     $stylesheets[] = "/{$app}/css/frontend.css";
        $stylesheets[] = "/phpgwapi/templates/frontend/css/frontend.css";
 //     $stylesheets[] = "/phpgwapi/js/jquery/mmenu/core/css/jquery.mmenu.css";

Modified: branches/Version-2_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_current.inc.php   
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/property/setup/tables_current.inc.php   
2017-02-08 18:30:24 UTC (rev 16284)
@@ -64,8 +64,8 @@
                                'contact_email' => array('type' => 'varchar', 
'precision' => '64', 'nullable' => True),
                                'category' => array('type' => 'int', 
'precision' => '4', 'nullable' => True),
                                'phpgw_account_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => True),
-                               'account_lid' => array('type' => 'varchar', 
'precision' => '25', 'nullable' => True),
-                               'account_pwd' => array('type' => 'varchar', 
'precision' => '32', 'nullable' => True),
+                               'account_lid' => array('type' => 'varchar', 
'precision' => 100, 'nullable' => True),
+                               'account_pwd' => array('type' => 'varchar', 
'precision' => 115, 'nullable' => True),
                                'account_status' => array('type' => 'int', 
'precision' => '4', 'nullable' => True,
                                        'default' => '1'),
                                'owner_id' => array('type' => 'int', 
'precision' => '4', 'nullable' => True)

Modified: branches/Version-2_0-branch/registration/inc/class.uireg.inc.php
===================================================================
--- branches/Version-2_0-branch/registration/inc/class.uireg.inc.php    
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/inc/class.uireg.inc.php    
2017-02-08 18:30:24 UTC (rev 16284)
@@ -66,9 +66,27 @@
                                $sub = lang('Account registration');
                        }
                        $this->set_header_footer_blocks();
+                       $old_ie = false;
+                       if (preg_match('/MSIE (6|7|8)/i', 
$_SERVER['HTTP_USER_AGENT']))
+                       {
+                               $old_ie = true;
+                       }
+
+                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/templates/pure/css/pure-min.css');
+                       if ($old_ie)
+                       {
+                               
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css');
+                       }
+                       else
+                       {
+                               
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/templates/pure/css/grids-responsive-min.css');
+                       }
+                       
$GLOBALS['phpgw']->css->add_external_file('registration/templates/base/css/rainbow_baby-blue.css');
+                       phpgwapi_jquery::formvalidator_generate(array('date', 
'security'));
                        $GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
                        $this->template->set_var('css', 
$GLOBALS['phpgw']->common->get_css());
                        $this->template->set_var('javascript', 
$GLOBALS['phpgw']->common->get_javascript());
+                       $this->template->set_var('str_base_url', 
$GLOBALS['phpgw']->link('/', array('logindomain' => $_REQUEST['logindomain']), 
true));
                        $this->template->set_var('lang_header', 
$GLOBALS['phpgw_info']['server']['system_name'] . ' :: ' . $sub);
                        $this->template->pfp('out', 'header');
                }
@@ -84,7 +102,6 @@
                        {
                                $this->simple_screen('error_general.tpl', 
$GLOBALS['phpgw']->common->error_list($errors));
                        }
-                       phpgwapi_jquery::formvalidator_generate(array('date', 
'security'));
 
                        $show_username_prompt = True;
                        /* Note that check_select_username() may not return */
@@ -200,15 +217,6 @@
                        ));
                        $this->template->set_block('_personal_info', 'form');
 
-                       $tpl_vars = array
-                               (
-                               'css' => $GLOBALS['phpgw']->common->get_css(),
-                               'javascript' => 
$GLOBALS['phpgw']->common->get_javascript(),
-                               'str_base_url' => $GLOBALS['phpgw']->link('/', 
array('logindomain' => $_REQUEST['logindomain']), true),
-                       );
-
-                       $this->template->set_var($tpl_vars);
-
                        if ($missing_fields)
                        {
                                while (list(, $field) = each($missing_fields))
@@ -401,9 +409,11 @@
                                $type = 'dropdown';
                        }
 
+                       $required_attrib = '';
                        if ($required == 'Y')
                        {
                                $a = 'r_reg';
+                               $required_attrib = "required='required'";
                        }
                        else
                        {
@@ -410,11 +420,16 @@
                                $a = 'o_reg';
                        }
 
+                       $placeholder = ltrim(lang($field_info['field_text']), 
'!');
+
                        if ($type == 'text' || $type == 'email' || $type == 
'first_name' ||
                                $type == 'last_name' || $type == 'address' || 
$type == 'city' ||
                                $type == 'zip' || $type == 'phone')
                        {
-                               $rstring = '<input type=text name="' . $a . '[' 
. $name . ']" value="' . $post_value . '">';
+                               $input_type = $type == 'email' ? 'email' : 
'text';
+                               $placeholder =  $type == 'email' ? 
'address@hidden' : $placeholder;
+
+                               $rstring = "<input 
placeholder=\"{$placeholder}\" type='{$input_type}' name=\"{$a}[{$name}]\" 
value=\"{$post_value}\" {$required_attrib}>";
                        }
 
                        if ($type == 'textarea')

Modified: branches/Version-2_0-branch/registration/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/config.tpl  
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/config.tpl  
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1,6 +1,6 @@
 <!-- BEGIN header -->
 <form method="POST" action="{action_url}">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr bgcolor="{th_bg}">
                        <td colspan="2"><font 
color="{th_text}">&nbsp;<b>{title}</b></font></td>
                </tr>

Copied: 
branches/Version-2_0-branch/registration/templates/base/css/rainbow_baby-blue.css
 (from rev 16283, trunk/registration/templates/base/css/rainbow_baby-blue.css)
===================================================================
--- 
branches/Version-2_0-branch/registration/templates/base/css/rainbow_baby-blue.css
                           (rev 0)
+++ 
branches/Version-2_0-branch/registration/templates/base/css/rainbow_baby-blue.css
   2017-02-08 18:30:24 UTC (rev 16284)
@@ -0,0 +1,1536 @@
address@hidden screen and (min-width: 35.5em) {
+    .u-sm-1,
+    .u-sm-1-1,
+    .u-sm-1-2,
+    .u-sm-1-3,
+    .u-sm-2-3,
+    .u-sm-1-4,
+    .u-sm-3-4,
+    .u-sm-1-5,
+    .u-sm-2-5,
+    .u-sm-3-5,
+    .u-sm-4-5,
+    .u-sm-5-5,
+    .u-sm-1-6,
+    .u-sm-5-6,
+    .u-sm-1-8,
+    .u-sm-3-8,
+    .u-sm-5-8,
+    .u-sm-7-8,
+    .u-sm-1-12,
+    .u-sm-5-12,
+    .u-sm-7-12,
+    .u-sm-11-12,
+    .u-sm-1-24,
+    .u-sm-2-24,
+    .u-sm-3-24,
+    .u-sm-4-24,
+    .u-sm-5-24,
+    .u-sm-6-24,
+    .u-sm-7-24,
+    .u-sm-8-24,
+    .u-sm-9-24,
+    .u-sm-10-24,
+    .u-sm-11-24,
+    .u-sm-12-24,
+    .u-sm-13-24,
+    .u-sm-14-24,
+    .u-sm-15-24,
+    .u-sm-16-24,
+    .u-sm-17-24,
+    .u-sm-18-24,
+    .u-sm-19-24,
+    .u-sm-20-24,
+    .u-sm-21-24,
+    .u-sm-22-24,
+    .u-sm-23-24,
+    .u-sm-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-sm-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-sm-1-12,
+    .u-sm-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-sm-1-8,
+    .u-sm-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-sm-1-6,
+    .u-sm-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-sm-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-sm-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-sm-1-4,
+    .u-sm-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-sm-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-sm-1-3,
+    .u-sm-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-sm-3-8,
+    .u-sm-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-sm-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-sm-5-12,
+    .u-sm-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-sm-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-sm-1-2,
+    .u-sm-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-sm-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-sm-7-12,
+    .u-sm-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-sm-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-sm-5-8,
+    .u-sm-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-sm-2-3,
+    .u-sm-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-sm-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-sm-3-4,
+    .u-sm-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-sm-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-sm-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-sm-5-6,
+    .u-sm-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-sm-7-8,
+    .u-sm-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-sm-11-12,
+    .u-sm-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-sm-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-sm-1,
+    .u-sm-1-1,
+    .u-sm-5-5,
+    .u-sm-24-24 {
+        width: 100%;
+    }
+}
+
address@hidden screen and (min-width: 48em) {
+    .u-md-1,
+    .u-md-1-1,
+    .u-md-1-2,
+    .u-md-1-3,
+    .u-md-2-3,
+    .u-md-1-4,
+    .u-md-3-4,
+    .u-md-1-5,
+    .u-md-2-5,
+    .u-md-3-5,
+    .u-md-4-5,
+    .u-md-5-5,
+    .u-md-1-6,
+    .u-md-5-6,
+    .u-md-1-8,
+    .u-md-3-8,
+    .u-md-5-8,
+    .u-md-7-8,
+    .u-md-1-12,
+    .u-md-5-12,
+    .u-md-7-12,
+    .u-md-11-12,
+    .u-md-1-24,
+    .u-md-2-24,
+    .u-md-3-24,
+    .u-md-4-24,
+    .u-md-5-24,
+    .u-md-6-24,
+    .u-md-7-24,
+    .u-md-8-24,
+    .u-md-9-24,
+    .u-md-10-24,
+    .u-md-11-24,
+    .u-md-12-24,
+    .u-md-13-24,
+    .u-md-14-24,
+    .u-md-15-24,
+    .u-md-16-24,
+    .u-md-17-24,
+    .u-md-18-24,
+    .u-md-19-24,
+    .u-md-20-24,
+    .u-md-21-24,
+    .u-md-22-24,
+    .u-md-23-24,
+    .u-md-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-md-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-md-1-12,
+    .u-md-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-md-1-8,
+    .u-md-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-md-1-6,
+    .u-md-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-md-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-md-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-md-1-4,
+    .u-md-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-md-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-md-1-3,
+    .u-md-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-md-3-8,
+    .u-md-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-md-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-md-5-12,
+    .u-md-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-md-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-md-1-2,
+    .u-md-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-md-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-md-7-12,
+    .u-md-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-md-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-md-5-8,
+    .u-md-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-md-2-3,
+    .u-md-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-md-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-md-3-4,
+    .u-md-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-md-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-md-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-md-5-6,
+    .u-md-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-md-7-8,
+    .u-md-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-md-11-12,
+    .u-md-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-md-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-md-1,
+    .u-md-1-1,
+    .u-md-5-5,
+    .u-md-24-24 {
+        width: 100%;
+    }
+}
+
address@hidden screen and (min-width: 58em) {
+    .u-lg-1,
+    .u-lg-1-1,
+    .u-lg-1-2,
+    .u-lg-1-3,
+    .u-lg-2-3,
+    .u-lg-1-4,
+    .u-lg-3-4,
+    .u-lg-1-5,
+    .u-lg-2-5,
+    .u-lg-3-5,
+    .u-lg-4-5,
+    .u-lg-5-5,
+    .u-lg-1-6,
+    .u-lg-5-6,
+    .u-lg-1-8,
+    .u-lg-3-8,
+    .u-lg-5-8,
+    .u-lg-7-8,
+    .u-lg-1-12,
+    .u-lg-5-12,
+    .u-lg-7-12,
+    .u-lg-11-12,
+    .u-lg-1-24,
+    .u-lg-2-24,
+    .u-lg-3-24,
+    .u-lg-4-24,
+    .u-lg-5-24,
+    .u-lg-6-24,
+    .u-lg-7-24,
+    .u-lg-8-24,
+    .u-lg-9-24,
+    .u-lg-10-24,
+    .u-lg-11-24,
+    .u-lg-12-24,
+    .u-lg-13-24,
+    .u-lg-14-24,
+    .u-lg-15-24,
+    .u-lg-16-24,
+    .u-lg-17-24,
+    .u-lg-18-24,
+    .u-lg-19-24,
+    .u-lg-20-24,
+    .u-lg-21-24,
+    .u-lg-22-24,
+    .u-lg-23-24,
+    .u-lg-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-lg-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-lg-1-12,
+    .u-lg-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-lg-1-8,
+    .u-lg-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-lg-1-6,
+    .u-lg-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-lg-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-lg-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-lg-1-4,
+    .u-lg-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-lg-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-lg-1-3,
+    .u-lg-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-lg-3-8,
+    .u-lg-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-lg-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-lg-5-12,
+    .u-lg-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-lg-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-lg-1-2,
+    .u-lg-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-lg-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-lg-7-12,
+    .u-lg-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-lg-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-lg-5-8,
+    .u-lg-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-lg-2-3,
+    .u-lg-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-lg-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-lg-3-4,
+    .u-lg-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-lg-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-lg-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-lg-5-6,
+    .u-lg-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-lg-7-8,
+    .u-lg-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-lg-11-12,
+    .u-lg-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-lg-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-lg-1,
+    .u-lg-1-1,
+    .u-lg-5-5,
+    .u-lg-24-24 {
+        width: 100%;
+    }
+}
+
address@hidden screen and (min-width: 75em) {
+    .u-xl-1,
+    .u-xl-1-1,
+    .u-xl-1-2,
+    .u-xl-1-3,
+    .u-xl-2-3,
+    .u-xl-1-4,
+    .u-xl-3-4,
+    .u-xl-1-5,
+    .u-xl-2-5,
+    .u-xl-3-5,
+    .u-xl-4-5,
+    .u-xl-5-5,
+    .u-xl-1-6,
+    .u-xl-5-6,
+    .u-xl-1-8,
+    .u-xl-3-8,
+    .u-xl-5-8,
+    .u-xl-7-8,
+    .u-xl-1-12,
+    .u-xl-5-12,
+    .u-xl-7-12,
+    .u-xl-11-12,
+    .u-xl-1-24,
+    .u-xl-2-24,
+    .u-xl-3-24,
+    .u-xl-4-24,
+    .u-xl-5-24,
+    .u-xl-6-24,
+    .u-xl-7-24,
+    .u-xl-8-24,
+    .u-xl-9-24,
+    .u-xl-10-24,
+    .u-xl-11-24,
+    .u-xl-12-24,
+    .u-xl-13-24,
+    .u-xl-14-24,
+    .u-xl-15-24,
+    .u-xl-16-24,
+    .u-xl-17-24,
+    .u-xl-18-24,
+    .u-xl-19-24,
+    .u-xl-20-24,
+    .u-xl-21-24,
+    .u-xl-22-24,
+    .u-xl-23-24,
+    .u-xl-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-xl-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-xl-1-12,
+    .u-xl-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-xl-1-8,
+    .u-xl-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-xl-1-6,
+    .u-xl-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-xl-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-xl-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-xl-1-4,
+    .u-xl-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-xl-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-xl-1-3,
+    .u-xl-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-xl-3-8,
+    .u-xl-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-xl-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-xl-5-12,
+    .u-xl-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-xl-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-xl-1-2,
+    .u-xl-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-xl-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-xl-7-12,
+    .u-xl-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-xl-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-xl-5-8,
+    .u-xl-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-xl-2-3,
+    .u-xl-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-xl-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-xl-3-4,
+    .u-xl-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-xl-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-xl-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-xl-5-6,
+    .u-xl-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-xl-7-8,
+    .u-xl-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-xl-11-12,
+    .u-xl-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-xl-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-xl-1,
+    .u-xl-1-1,
+    .u-xl-5-5,
+    .u-xl-24-24 {
+        width: 100%;
+    }
+}
+* {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+*:before,
+*:after {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+html, button, input, select, textarea,
+.pure-g [class *= "pure-u"] {
+    font-family: sans-serif;
+    font-weight: 100;
+    letter-spacing: 0.01em;
+}
+
+
+/* --------------------------
+ * Element Styles
+ * --------------------------
+*/
+
+body {
+    min-width: 320px;
+    background-color: #fff;
+    color: #777;
+    line-height: 1.6;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-weight: bold;
+    color: rgb(75, 75, 75);
+}
+h3 {
+    font-size: 1.25em;
+}
+h4 {
+    font-size: 1.125em;
+}
+
+a {
+    color: #3b8bba; /* block-background-text-normal */
+    text-decoration: none;
+}
+
+a:visited {
+    color: #265778; /* block-normal-text-normal */
+}
+
+dt {
+    font-weight: bold;
+}
+dd {
+    margin: 0 0 10px 0;
+}
+
+aside {
+    background: #1f8dd6; /* same color as selected state on site menu */
+    margin: 1em 0;
+    padding: 0.3em 1em;
+    border-radius: 3px;
+    color: #fff;
+}
+    aside a, aside a:visited {
+        color: rgb(169, 226, 255);
+    }
+
+
+/* --------------------------
+ * Layout Styles
+ * --------------------------
+*/
+
+/* Navigation Push Styles */
+#layout {
+    position: relative;
+    padding-left: 0;
+}
+    #layout.active #menu {
+        left: 160px;
+        width: 160px;
+    }
+
+/* Apply the .box class on the immediate parent of any grid element (pure-u-*) 
to apply some padding. */
+.l-box {
+    padding: 1em;
+}
+
+.l-wrap {
+    margin-left: auto;
+    margin-right: auto;
+}
+.content .l-wrap {
+    margin-left: -1em;
+    margin-right: -1em;
+}
+
+
+/* --------------------------
+ * Header Module Styles
+ * --------------------------
+*/
+
+.header {
+    font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    max-width: 768px;
+    margin: 0 auto;
+    padding: 1em;
+    text-align: center;
+    border-bottom: 1px solid #eee;
+    background: #fff;
+    letter-spacing: 0.05em;
+}
+    .header h1 {
+        font-size: 300%;
+        font-weight: 100;
+        margin: 0;
+    }
+     .header h2 {
+        font-size: 125%;
+        font-weight: 100;
+        line-height: 1.5;
+        margin: 0;
+        color: #666;
+        letter-spacing: -0.02em;
+    }
+
+
+ /* --------------------------
+  * Content Module Styles
+  * --------------------------
+ */
+
+/* The content div is placed as a wrapper around all the docs */
+.content {
+    margin-left: auto;
+    margin-right: auto;
+    padding-left: 1em;
+    padding-right: 1em;
+    max-width: 768px;
+}
+
+    .content .content-subhead {
+        margin: 2em 0 1em 0;
+        font-weight: 300;
+        color: #888;
+        position: relative;
+    }
+
+    .content .content-spaced {
+        line-height: 1.8;
+    }
+
+    .content .content-quote {
+        font-family: "Georgia", serif;
+        color: #666;
+        font-style: italic;
+        line-height: 1.8;
+        border-left: 5px solid #ddd;
+        padding-left: 1.5em;
+    }
+
+    .content-link {
+        position: absolute;
+        top: 0;
+        right: 0;
+        display: block;
+        height: 100%;
+        width: 20px;
+        background: transparent url('/img/link-icon.png') no-repeat center 
center;
+        background-size: 20px 20px;
+    }
+
+    @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) {
+        .content-link {
+            background-image: url('/img/address@hidden');
+        }
+    }
+
+
+/* --------------------------
+ * Code Styles
+ * --------------------------
+*/
+
+pre,
+code {
+    font-family: Consolas, Courier, monospace;
+    color: #333;
+    background: rgb(250, 250, 250);
+}
+
+code {
+    padding: 0.2em 0.4em;
+    white-space: nowrap;
+}
+.content p code {
+    font-size: 90%;
+}
+
+.code {
+    margin-left: -1em;
+    margin-right: -1em;
+    padding: 1em;
+    border: 1px solid #eee;
+    border-left-width: 0;
+    border-right-width: 0;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+}
+.code code {
+    font-size: 95%;
+    white-space: pre;
+    word-wrap: normal;
+    padding: 0;
+    background: none;
+}
+.code-wrap code {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/* --------------------------
+ * Footer Module Styles
+ * --------------------------
+*/
+
+.footer {
+    font-size: 87.5%;
+    border-top: 1px solid #eee;
+    margin-top: 3.4286em;
+    padding: 1.1429em;
+    background: rgb(250, 250, 250);
+}
+
+.legal {
+    line-height: 1.6;
+    text-align: center;
+    margin: 0 auto;
+}
+
+    .legal-license {
+        margin-top: 0;
+    }
+    .legal-links {
+        list-style: none;
+        padding: 0;
+        margin-bottom: 0;
+    }
+    .legal-copyright {
+        margin-top: 0;
+        margin-bottom: 0;
+    }
+
+
+/* --------------------------
+ * Main Navigation Bar Styles
+ * --------------------------
+*/
+
+/* Add transition to containers so they can push in and out */
+#layout,
+#menu,
+.menu-link {
+    -webkit-transition: all 0.2s ease-out;
+    -moz-transition: all 0.2s ease-out;
+    -ms-transition: all 0.2s ease-out;
+    -o-transition: all 0.2s ease-out;
+    transition: all 0.2s ease-out;
+}
+
+#layout.active .menu-link {
+    left: 160px;
+}
+
+#menu {
+    margin-left: -160px; /* "#menu" width */
+    width: 160px;
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    z-index: 1000; /* so the menu or its navicon stays above all content */
+    background: #191818;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+}
+    #menu a {
+        color: #999;
+        border: none;
+        white-space: normal;
+        padding: 0.625em 1em;
+    }
+
+    #menu .pure-menu-open {
+        background: transparent;
+        border: 0;
+    }
+
+    #menu .pure-menu ul {
+        border: none;
+        background: transparent;
+        display: block;
+    }
+
+    #menu .pure-menu ul,
+    #menu .pure-menu .menu-item-divided {
+        border-top: 1px solid #333;
+    }
+
+        #menu .pure-menu li a:hover,
+        #menu .pure-menu li a:focus {
+            background: #333;
+        }
+
+    .menu-link {
+        position: fixed;
+        display: block; /* show this only on small screens */
+        top: 0;
+        left: 0; /* "#menu width" */
+        background: #000;
+        background: rgba(0,0,0,0.7);
+        font-size: 11px; /* change this value to increase/decrease button size 
*/
+        z-index: 10;
+        width: 4em;
+        height: 4em;
+        padding: 1em;
+    }
+
+        .menu-link:hover,
+        .menu-link:focus {
+            background: #000;
+        }
+
+        .menu-link span {
+            position: relative;
+            display: block;
+            margin-top: 0.9em;
+        }
+
+        .menu-link span,
+        .menu-link span:before,
+        .menu-link span:after {
+            background-color: #fff;
+            width: 100%;
+            height: .2em;
+            -webkit-transition: all 0.4s;
+               -moz-transition: all 0.4s;
+                -ms-transition: all 0.4s;
+                 -o-transition: all 0.4s;
+                    transition: all 0.4s;
+        }
+
+            .menu-link span:before,
+            .menu-link span:after {
+                position: absolute;
+                top: -.55em;
+                content: " ";
+            }
+
+            .menu-link span:after {
+                top: .55em;
+            }
+
+        .menu-link.active span {
+            background: transparent;
+        }
+
+            .menu-link.active span:before {
+                -webkit-transform: rotate(45deg) translate(.5em, .4em);
+                   -moz-transform: rotate(45deg) translate(.5em, .4em);
+                    -ms-transform: rotate(45deg) translate(.5em, .4em);
+                     -o-transform: rotate(45deg) translate(.5em, .4em);
+                        transform: rotate(45deg) translate(.5em, .4em);
+            }
+
+            .menu-link.active span:after {
+                -webkit-transform: rotate(-45deg) translate(.4em, -.3em);
+                   -moz-transform: rotate(-45deg) translate(.4em, -.3em);
+                    -ms-transform: rotate(-45deg) translate(.4em, -.3em);
+                     -o-transform: rotate(-45deg) translate(.4em, -.3em);
+                        transform: rotate(-45deg) translate(.4em, -.3em);
+            }
+
+    #menu .pure-menu-heading {
+        font-size: 125%;
+        font-weight: 300;
+        letter-spacing: 0.1em;
+        color: #fff;
+        margin-top: 0;
+        padding: 0.5em 0.8em;
+        text-transform: uppercase;
+    }
+    #menu .pure-menu-heading:hover,
+    #menu .pure-menu-heading:focus {
+        color: #999;
+    }
+
+    #menu .pure-menu-selected {
+        background: #1f8dd6;
+    }
+
+        #menu .pure-menu-selected a {
+            color: #fff;
+        }
+
+        #menu li.pure-menu-selected a:hover,
+        #menu li.pure-menu-selected a:focus {
+            background: none;
+        }
+
+
+
+/* ---------------------
+ * Smaller Module Styles
+ * ---------------------
+*/
+
+.pure-img-responsive {
+    max-width: 100%;
+    height: auto;
+}
+
+.pure-paginator .pure-button {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.pure-button {
+    font-family: inherit;
+}
+a.pure-button-primary {
+    color: white;
+}
+
+
+/* green call to action button class */
+.notice {
+    background-color: #61B842;
+    color: white;
+}
+
+.muted {
+    color: #ccc;
+}
+
+
+
+/* -------------
+ * Table Styles
+ * -------------
+*/
+
+.pure-table th,
+.pure-table td {
+    padding: 0.5em 1em;
+}
+
+.table-responsive {
+    margin-left: -1em;
+    margin-right: -1em;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+    margin-bottom: 1em;
+}
+.table-responsive table {
+    width: 100%;
+    min-width: 35.5em;
+    border-left-width: 0;
+    border-right-width: 0;
+}
+
+.table-responsive .mq-table {
+    width: 100%;
+    min-width: 44em;
+}
+.mq-table th.highlight {
+    background-color: rgb(255, 234, 133);
+}
+.mq-table td.highlight {
+    background-color: rgb(255, 250, 229);
+}
+.mq-table th.highlight code,
+.mq-table td.highlight code {
+    background: rgb(255, 255, 243);
+}
+.mq-table-mq code {
+    font-size: 0.875em;
+}
+
+/* ----------------------------
+ * Example for full-width Grids
+ * ----------------------------
+*/
+
+.grids-example {
+    background: rgb(250, 250, 250);
+    margin: 2em auto;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+}
+
+/* --------------------------
+ * State Rules
+ * --------------------------
+*/
+
+
+.is-code-full {
+    text-align: center;
+}
+.is-code-full .code {
+    margin-left: auto;
+    margin-right: auto;
+}
+.is-code-full code {
+    display: inline-block;
+    max-width: 768px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
+/* --------------------------
+ * Responsive Styles
+ * --------------------------
+*/
+
address@hidden screen and (min-width: 35.5em) {
+
+    .legal-license {
+        text-align: left;
+        margin: 0;
+    }
+    .legal-copyright,
+    .legal-links,
+    .legal-links li {
+        text-align: right;
+        margin: 0;
+    }
+
+}
+
address@hidden screen and (min-width: 48em) {
+
+    .l-wrap,
+    .l-wrap .content {
+        padding-left: 1em;
+        padding-right: 1em;
+    }
+    .content .l-wrap {
+        margin-left: -2em;
+        margin-right: -2em;
+    }
+
+    .header,
+    .content {
+        padding-left: 2em;
+        padding-right: 2em;
+    }
+
+    .header h1 {
+        font-size: 320%;
+    }
+    .header h2 {
+        font-size: 128%;
+    }
+
+    .content p {
+        font-size: 1.125em;
+    }
+
+    .code {
+        margin-left: auto;
+        margin-right: auto;
+        border-left-width: 1px;
+        border-right-width: 1px;
+    }
+
+    .table-responsive {
+        margin-left: auto;
+        margin-right: auto;
+    }
+    .table-responsive table {
+        border-left-width: 1px;
+        border-right-width: 1px;
+    }
+
+}
+
address@hidden (max-width: 58em) {
+    /* Only apply this when the window is smaller. Otherwise, the following
+    case results in extra padding on the left:
+        * Make the window small. (Rotate to portrait on a mobile.)
+        * Tap the menu to trigger the active state.
+        * Make the window large again. (Rotate to landscape on mobile.)
+    */
+    #layout.active {
+        position: relative;
+        left: 160px;
+    }
+}
+
address@hidden (min-width: 58em) {
+
+    #layout {
+        padding-left: 160px; /* left col width "#menu" */
+        left: 0;
+    }
+    #menu {
+        left: 160px;
+    }
+    .menu-link {
+        position: fixed;
+        left: 160px;
+        display: none;
+    }
+    #layout.active .menu-link {
+        left: 160px;
+    }
+
+}
+
+/**
+ * Baby Blue theme for RainbowJS
+ *
+ * @author tilomitra
+ */
+
+pre .comment {
+    color: #999;
+}
+
+pre .tag,
+pre .tag-name,
+pre .support.tag-name {
+    color: rgb(85, 85, 85);
+}
+
+pre .keyword,
+pre .css-property,
+pre .vendor-prefix,
+pre .sass,
+pre .class,
+pre .id,
+pre .css-value,
+pre .entity.function,
+pre .storage.function {
+    font-weight: bold;
+}
+
+pre .css-property,
+pre .css-value,
+pre .vendor-prefix,
+pre .support.namespace {
+    color: #333;
+}
+
+pre .constant.numeric,
+pre .keyword.unit,
+pre .hex-color {
+    font-weight: normal;
+    color: #099;
+}
+
+pre .attribute,
+pre .variable,
+pre .support {
+    color:  #757575; /* skinbuilder block-page-text-normal with #1f8dd6 as 
primary */
+}
+
+pre .string,
+pre .support.value  {
+    font-weight: normal;
+    color: #3b8bba; /* skinbuilder block-mine-text-low with #1f8dd6 as primary 
*/
+}

Modified: branches/Version-2_0-branch/registration/templates/base/fields.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/fields.tpl  
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/fields.tpl  
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1,26 +1,25 @@
 <!-- BEGIN header -->
 <form method="POST" action="{action_url}">
        <center><h3>{message}</h3></center>
-       <table border="0" align="center" width="50%">
-               <!-- END header -->
+       <!-- END header -->
 
-               <!-- BEGIN list -->
-               <table border="0" align="center" width="75%">
-                       <tr class="{row_on}">
-                               <td colspan="7">{lang_current_fields}</td>
+       <!-- BEGIN list -->
+       <table class="pure-table pure-table-bordered pure-table-striped">
+               <thead>
+                       <tr>
+                               <th width=5%>{lang_name_and_shortdesc}</th>
+                               <th>{lang_text}</th>
+                               <th>{lang_type}</th>
+                               <th>{lang_values_and_shortdesc}</th>
+                               <th>{lang_required}</th>
+                               <th>{lang_remove}</th>
+                               <th>{lang_order}</th>
                        </tr>
-                       <tr class="{row_off}">
-                               <td width=5%>{lang_name_and_shortdesc}</td>
-                               <td>{lang_text}</td>
-                               <td>{lang_type}</td>
-                               <td>{lang_values_and_shortdesc}</td>
-                               <td>{lang_required}</td>
-                               <td>{lang_remove}</td>
-                               <td>{lang_order}</td>
-                       </tr>
+               </thead>
+               <tbody>
 
                        <!-- BEGIN info -->
-                       <tr class="{row_off}">
+                       <tr>
                                <td><input type="text" 
name="{field_short_name}_name" size="10" value="{field_name}"></td>
                                <td><input type="text" 
name="{field_short_name}_text" value="{field_text}"></td>
                                <td><select name="{field_short_name}_type">
@@ -47,20 +46,20 @@
                                <td><input type="text" 
name="{field_short_name}_order" size="2" value="{field_order}"></td>
                        </tr>
                        <!-- END info -->
+               </tbody>
+       </table>
+       <!-- END list -->
 
-               </table>
-               <!-- END list -->
-
-               <!-- BEGIN footer -->
-               <p>
-               <table border="0" align="center" width="50%">
-                       <tr>
-                               <!--
-                                  <td align="left"><input type="submit" 
name="cancel" value="{lang_cancel}"></td>
-                               -->
-                               <td align="center">
-                                       <input type="submit" name="submit" 
value="{lang_update_add}"></td>
-                       </tr>
-               </table>
+       <!-- BEGIN footer -->
+       <p>
+       <table border="0" align="center" width="50%">
+               <tr>
+                       <!--
+                          <td align="left"><input type="submit" name="cancel" 
value="{lang_cancel}"></td>
+                       -->
+                       <td align="center">
+                               <input type="submit" name="submit" 
value="{lang_update_add}"></td>
+               </tr>
+       </table>
 </form>
 <!-- END footer -->

Modified: branches/Version-2_0-branch/registration/templates/base/layout.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/layout.tpl  
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/layout.tpl  
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1,18 +1,35 @@
 <!-- BEGIN header -->
-<header>
-       {javascript}
-       {css}
-</header>
+<!DOCTYPE html>
+<html lang="no">
+       <head>
+               <meta charset="utf-8">
+               <meta name="viewport" content="width=device-width, 
initial-scale=1.0">
+               <meta name="description" content="User registration">
+               <title>{lang_header}</title>
 
-<body bgcolor="#FFFFFF" marginheight="0" marginwidth="0" leftmargin="0" 
rightmargin="0" topmargin="0" bottommargin="0">
-       <table border="0" width="100%" cellspacing="0" cellpadding="2">
-               <tr bgcolor="#486591">
-                       <td width="100%" bgcolor="#486591"><font 
color="#fefefe">{lang_header}</font></td>
-               </tr>
-       </table>
-       <!-- END header -->
 
-       <!-- BEGIN footer -->
+               <script type="text/javascript">
+                       <!--
+                       var strBaseURL = '{str_base_url}';
 
-       <!-- END footer -->
+                       //-->
+               </script>
+               {javascript}
+               {css}
+       </head>
 
+       <body>
+               <div class="header">
+                       <h1>{lang_header}</h1>
+
+               </div>
+               <div class="content">
+
+                       <!-- END header -->
+
+                       <!-- BEGIN footer -->
+               </div>
+       </body>
+</html>
+<!-- END footer -->
+

Modified: 
branches/Version-2_0-branch/registration/templates/base/lostpw_select.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/lostpw_select.tpl   
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/lostpw_select.tpl   
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1,18 +1,18 @@
 <!-- BEGIN form -->
-<center>{errors}</center>
-<form action="{form_action}" method="POST">
-       <table border="0" width="40%" align="center">
-               <p>
-                       {lang_explain}
-               </p>
-               <tr>
-                       <td>{lang_username}</td>
-                       <td><input name="r_reg[loginid]" 
value="{value_username}"></td>
-               </tr>
+<p>{errors}</p>
+<form action="{form_action}" method="POST" class="pure-form pure-form-aligned">
+       <p>
+               {lang_explain}
+       </p>
+       <fieldset>
+               <div class="pure-control-group">
+                       <label>{lang_username}</label>
+                       <input name="r_reg[loginid]" value="{value_username}" 
required="required" type="email">
+               </div>
 
-               <tr>
-                       <td colspan="2"><input type="submit" name="submit" 
value="{lang_submit}"></td>
-               </tr>
-       </table>
+               <div class="pure-controls">
+                       <button type="submit" class="pure-button 
pure-button-primary" name="submit">{lang_submit}</button>
+        </div>
+       </fieldset>
 </form>
 <!-- END form -->

Modified: 
branches/Version-2_0-branch/registration/templates/base/personal_info.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/personal_info.tpl   
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/personal_info.tpl   
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1,14 +1,4 @@
 <!-- BEGIN form -->
-<style type="text/css">
-       #country { width: 300px; }
-       #gender { width: 300px; }
-       #loc1 { width: 300px; }
-       #loc2 { width: 300px; }
-       #loc3 { width: 300px; }
-       #loc4 { width: 300px; }
-       #loc5 { width: 300px; }
-       #loc6 { width: 300px; }
-</style>
 
 <script language="JavaScript" type="text/javascript">
        var tos;
@@ -31,68 +21,57 @@
        }
 </script>
 
-{css}
+<h2 class="content-subhead">{message}</h2>
+<p>{errors}</p>
+<form action="{form_action}" method="POST" class="pure-form pure-form-aligned">
+       <fieldset>
 
-<script type="text/javascript">
-<!--
-       var strBaseURL = '{str_base_url}';
-       {win_on_events}
-//-->
-</script>
-{javascript}
-
-
-<center>{message}</center>
-<center>{errors}</center>
-<form action="{form_action}" method="POST">
-       <table border="0" width="75%" align="center">
-
                <!-- BEGIN username -->
-               <tr>
+               <div class="pure-control-group">
                        <td width="1%"></td>
                        {domain_select}
-               </tr>
-               <tr>
-                       <td width="1%">{missing_loginid}</td>
-                       <td>{lang_username}</td>
-                       <td>{domain_from_host}<input name="r_reg[loginid]" 
value="{value_username}"></td>
-               </tr>
+               </div>
+               <div class="pure-control-group">
+                       <label 
for="username">{missing_loginid}{lang_username}</label>
+                       {domain_from_host}<input id="username" type="text" 
placeholder="{lang_username}" name="r_reg[loginid]" value="{value_username}" 
required>
+               </div>
                <!-- END username -->
 
 
                <!-- BEGIN password -->
-               <tr>
-                       <td width="1%">{missing_passwd}</td>
-                       <td><b>{lang_password}</b></td>
-                       <td><input type="password" name="r_reg[passwd]" 
value="{value_passwd}"></td>
-               </tr>
+               <div class="pure-control-group">
+                       {missing_passwd}
+                       <label for="password">{lang_password}</label>
+                       <input type="password" id="password" type="text" 
placeholder="{lang_password}" name="r_reg[passwd]" value="{value_passwd}" 
required>
+               </div>
 
-               <tr>
-                       <td width="1%">{missing_passwd_confirm}</td>
-                       <td><b>{lang_reenter_password}</b></td>
-                       <td><input type="password" name="r_reg[passwd_confirm]" 
value="{value_passwd_confirm}"></td>
-               </tr>
+               <div class="pure-control-group">
+                       <label 
for="password2">{missing_passwd_confirm}{lang_reenter_password}</label>
+                       <input type="password" id="password2" type="text" 
placeholder="{lang_password}" name="r_reg[passwd_confirm]" 
value="{value_passwd_confirm}" required>
+               </div>
                <!-- END password -->
 
                <!-- BEGIN other_fields_proto -->
-               <tr>
-                       <td width="1%">{missing_indicator}</td>
-                       <td>{bold_start}{lang_displayed_text}{bold_end}</td>
-                       <td>{input_field}</td>
-               </tr>
+               <div class="pure-control-group">
+                       <label>{missing_indicator} {lang_displayed_text}</label>
+                       {input_field}
+               </div>
                <!-- END other_fields_proto -->
 
                <!-- BEGIN tos -->
-               <tr>
-                       <td width="1%">{missing_tos_agree}</td>
-                       <td colspan="2"><b><font size="2"><a 
href="javascript:opentoswindow()">{lang_tos_agree}</a></font></b><input 
type="checkbox" name="r_reg[tos_agree]" {value_tos_agree}></td>
-               </tr>
+               <div class="pure-controls">
+                       <label for="cb" class="pure-checkbox">
+                               {missing_tos_agree}
+                               <input id="cb" type="checkbox" 
name="r_reg[tos_agree]" {value_tos_agree} required="required">
+                               <a 
href="javascript:opentoswindow()">{lang_tos_agree}</a>
+                       </label>
+               </div>
                <!-- END tos -->
+               <div class="pure-controls">
+                       <button type="submit" class="pure-button 
pure-button-primary" name="submit">{lang_submit}</button>
+        </div>
 
-               <tr>
-                       <td colspan="3"><input type="submit" name="submit" 
value="{lang_submit}"></td>
-               </tr>
-       </table>
+       </fieldset>
 </form>
 <!-- END form -->
 

Modified: branches/Version-2_0-branch/registration/templates/base/tos.tpl
===================================================================
--- branches/Version-2_0-branch/registration/templates/base/tos.tpl     
2017-02-08 18:18:09 UTC (rev 16283)
+++ branches/Version-2_0-branch/registration/templates/base/tos.tpl     
2017-02-08 18:30:24 UTC (rev 16284)
@@ -1 +1 @@
-<p><center>{extra_text}</center>
+<p>{extra_text}




reply via email to

[Prev in Thread] Current Thread [Next in Thread]