Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/delibero.git
More simplifications of user interface.
| Author | Dave Jarvis <email> |
|---|---|
| Date | 2014-07-13 16:30:22 GMT-0700 |
| Commit | f6b2a1947821b7d7ea400e541edf2cf9b8092cd8 |
| Parent | 6c4fadb |
account.html
| <div id="account-menu" class="account-menu"> | ||
| <a href="#account-comments">Comments</a> | | ||
| + <a class="account-details-link" href="#accounts-interests">Interests</a> | | ||
| <a class="account-details-link" href="#accounts-edits">Edits</a> | | ||
| <a class="account-details-link" href="#accounts-policies">Policies</a> | |
css/interest.css
| +div.main { } | ||
| + | ||
| div.policy { | ||
| clear: both; | ||
 | ||
| div.policy-tag { | ||
| display: inline; | ||
| -} | ||
| - | ||
| -#interests { | ||
| - clear: both; | ||
| - position: absolute; | ||
| - top: 3em; | ||
| - right: 1em; | ||
| -} | ||
| - | ||
| -#interests div.policy-tag { | ||
| - display: block; | ||
| - margin: 1em; | ||
| -} | ||
| - | ||
| -#interests input[type="submit"] { | ||
| - color: #182945; | ||
| } | ||
css/summary.css
| } | ||
| +/** Remove the horizontal separator. */ | ||
| +div.policy-tag::after { content: ""; } | ||
| + | ||
| div.policy-tags { | ||
| float: right; | ||
| } | ||
| div.policy-tag { | ||
| - margin: 1em; | ||
| + margin-top: 0.5em; | ||
| } | ||
| ||
| } | ||
| -ol.policy-implication li { | ||
| - padding-top: 0.5em; | ||
| +ul.policy-implication li { | ||
| + padding-bottom: 0.5em; | ||
| } | ||
| + | ||
css/theme.css
| div.policy-tag { | ||
| - margin-right: 0.5em; | ||
| - padding: 3px; | ||
| + color: #888; | ||
| font-size: 10pt; | ||
| - border-radius: 4px; | ||
| - border: 1px solid #182945; | ||
| - background-color: #FBF6CE; | ||
| -} | ||
| - | ||
| -div.activation { | ||
| - color: #444; | ||
| } | ||
| -#interests { | ||
| - border: 2px solid #182945; | ||
| - border-radius: 4px; | ||
| - padding: 0.5em; | ||
| -} | ||
| +/** Separate tags using horizontal bars. */ | ||
| +div.policy-tag::after { content: " |"; } | ||
| +div.policy-tag:last-child:after { content: ""; } | ||
| -#interests div.interests-title { | ||
| - text-align: center; | ||
| +div.activation { | ||
| color: #444; | ||
| -} | ||
| - | ||
| -#interests span.delete { | ||
| - background-color: #182945; | ||
| - color: #E8E8F0; | ||
| - border-radius: 50%; | ||
| - padding-left: 3px; | ||
| - padding-right: 3px; | ||
| - font-weight: bold; | ||
| } | ||
index.html
| </div> | ||
| <div class="activation"> | ||
| - <div class="activation-date">01-Jan-2014</div> | ||
| - <div class="activation-time">11:30am EST</div> | ||
| + <div class="activation-date">Jan 1, 2017</div> | ||
| + <div class="activation-time">11:30am</div> | ||
| </div> | ||
| </div> | ||
| ||
| </div> | ||
| <div class="activation"> | ||
| - <div class="activation-date">12-Feb-2014</div> | ||
| - <div class="activation-time">3:15pm EST</div> | ||
| + <div class="activation-date">Feb 12, 2017</div> | ||
| + <div class="activation-time">3:15pm</div> | ||
| </div> | ||
| </div> | ||
| <div class="policy-summary"> | ||
| <div class="policy-title"> | ||
| - <h1 class="policy-title">Digital Freedom Act</h1> | ||
| + <a href=""><h1 class="policy-title">Digital Freedom Act</h1></a> | ||
| </div> | ||
| <div class="policy-tags"> | ||
| ||
| </div> | ||
| <div class="activation"> | ||
| - <div class="activation-date">21-Apr-2014</div> | ||
| - <div class="activation-time">1:45pm EST</div> | ||
| + <div class="activation-date">Apr 21, 2017</div> | ||
| + <div class="activation-time">1:45pm</div> | ||
| </div> | ||
| </div> | ||
| <div class="policy-summary"> | ||
| <div class="policy-title"> | ||
| - <h1 class="policy-title">Omnibus Crime Bill</h1> | ||
| + <a href=""><h1 class="policy-title">Omnibus Crime Bill</h1></a> | ||
| </div> | ||
| <div class="policy-tags"> | ||
| ||
| </div> | ||
| <div class="activation"> | ||
| - <div class="activation-date">22-Jul-2014</div> | ||
| - <div class="activation-time">4:20pm EST</div> | ||
| + <div class="activation-date">Sep 22, 2014</div> | ||
| + <div class="activation-time">4:20pm</div> | ||
| </div> | ||
| </div> | ||
| <div class="policy-summary"> | ||
| <div class="policy-title"> | ||
| - <h1 class="policy-title">Marijuana Legalization Act</h1> | ||
| + <a href=""><h1 class="policy-title">Marijuana Legalization Act</h1></a> | ||
| </div> | ||
| <div class="policy-tags"> | ||
| ||
| </div> | ||
| <div class="activation"> | ||
| - <div class="activation-date">15-Aug-2014</div> | ||
| - <div class="activation-time">12:25pm EST</div> | ||
| + <div class="activation-date">Aug 15, 2018</div> | ||
| + <div class="activation-time">12:25pm</div> | ||
| </div> | ||
| </div> | ||
| <div class="policy-summary"> | ||
| <div class="policy-title"> | ||
| - <h1 class="policy-title">First Nations Land Use Bill</h1> | ||
| + <a href=""><h1 class="policy-title">First Nations Land Use Bill</h1></a> | ||
| </div> | ||
| <div class="policy-tags"> | ||
| <div class="policy-tag">Bill</div> | ||
| <div class="policy-tag">Environment</div> | ||
| <div class="policy-tag">First Nations</div> | ||
| <div class="policy-tag">Pipeline</div> | ||
| <div class="policy-tag">Property</div> | ||
| </div> | ||
| </div> | ||
| - </div> | ||
| - </div> | ||
| - | ||
| - <div id="interests" class="interests"> | ||
| - <div class="interests-title">Interests</div> | ||
| - <div class="policy-tags"> | ||
| - <div class="policy-tag"><span class="delete">✗</span> Criminal Code</div> | ||
| - <div class="policy-tag"><span class="delete">✗</span> Environment</div> | ||
| - <div class="policy-tag"><span class="delete">✗</span> Education</div> | ||
| </div> | ||
| - <div id="interest-add"> | ||
| - <input type="text" value="" maxlength="16" size="16" /> | ||
| - <input type="submit" value="✔" /> | ||
| + <div class="policy"> | ||
| + | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div id="footer"> | ||
| - <p> </p> | ||
| - <p> </p> | ||
| + <a href="account.html">Account</a> | ||
| </div> | ||
js/summary.js
| { | ||
| "a": 180, | ||
| - "d": -10, | ||
| - "e": "div.policy-tags", | ||
| - "t": 'Policy categorization tags.' | ||
| - }, | ||
| - { | ||
| - "a": 180, | ||
| - "d": -5, | ||
| - "e": "a#policy-feedback-share", | ||
| - "t": 'Users can share the link with other interested parties.' | ||
| - }, | ||
| - { | ||
| - "a": 180, | ||
| "d": -5, | ||
| "e": "a#policy-feedback-edit", | ||
| ||
| "a": 180, | ||
| "d": -5, | ||
| - "e": "div.policy-implications-pro ol.policy-implication li:first", | ||
| + "e": "div.policy-implications-pro ul.policy-implication li:first", | ||
| "t": 'The highest-rated positive policy implications are displayed, sorted by most advantageous.' | ||
| }, | ||
| { | ||
| "a": 180, | ||
| "d": -5, | ||
| - "e": "div.policy-implications-con ol.policy-implication li:first", | ||
| + "e": "div.policy-implications-con ul.policy-implication li:first", | ||
| "t": 'The highest-rated negative policy implications are displayed, sorted by most disadvantageous.' | ||
| }, | ||
| { | ||
| "a": 180, | ||
| "d": -5, | ||
| - "e": "a.proposal", | ||
| + "e": "a#policy-proposal", | ||
| "t": 'Provides the complete proposal text. Legislative text is presented alongside its layperson translation.' | ||
| }, | ||
summary.html
| <div id="policy-overview-text" class="policy-overview-text editable"> | ||
| <p> | ||
| -We all need water for drinking, washing, cooking, and growing food. Water supports every aspect of a <a class="internal-link" href="">healthy environment</a>, a <a class="internal-link" href="">growing economy</a>, and <a class="internal-link" href="">prosperous communities</a>. | ||
| +Everyone needs water for drinking, washing, cooking, and growing food. Water supports every aspect of a <a class="internal-link" href="">healthy environment</a>, a <a class="internal-link" href="">growing economy</a>, and <a class="internal-link" href="">prosperous communities</a>. | ||
| </p> | ||
| <p> | ||
| While British Columbia has almost 300 unique watersheds (fish-bearing rivers, spectacular lakes, and exceptional wetlands), our water supply is finite. Under growing <a class="internal-link" href="">population pressures</a>, a <a class="internal-link" href="">changing climate</a>, and expanding development, we must ensure that fresh, clean water is sustainably managed for today's needs and for future generations. | ||
| </p> | ||
| <p> | ||
| The Water Sustainability Act replaces the existing <a class="external-link" href="http://www.bclaws.ca/Recon/document/ID/freeside/00_96483_01">Water Act</a>. | ||
| </p> | ||
| <div id="policy-overview-links" class="policy-overview-links"> | ||
| <div id="policy-feedback" class="policy-feedback"> | ||
| + <a id="policy-proposal" class="policy-feedback-link" href="proposal.html">proposal</a> | | ||
| <a id="policy-hypothesis" class="policy-feedback-link" href="hypothesis.html">hypothesis</a> | | ||
| <a id="policy-resources" class="policy-feedback-link" href="resources.html">resources</a> | | ||
| <a id="policy-feedback-discuss" class="policy-feedback-link" href="discuss.html">discuss</a> | | ||
| - <a id="policy-feedback-share" class="policy-feedback-link" href="">share</a> | | ||
| <a id="policy-feedback-flag" class="policy-feedback-link" href="">flag</a> | ||
| </div> | ||
| ||
| <h2 id="policy-pro-title" class="policy-pro-title">Implications</h2> | ||
| - <ol class="policy-implication"> | ||
| + <ul class="policy-implication"> | ||
| <li> | ||
| Increase <a href="">water use efficiency</a>. | ||
| </li> | ||
| <li> | ||
| Well owner information will <a href="">improve understanding</a> of | ||
| how aquifers interact with lakes and streams. | ||
| - </li> | ||
| - <li> | ||
| - Improve <a href="">aquifer management</a>. | ||
| </li> | ||
| <li> | ||
| ||
| under the <a href="">Area-Based Regulations Act</a>. | ||
| </li> | ||
| - </ol> | ||
| + <li> | ||
| + Wider <a href="">participation</a> in decisions and water governance | ||
| + approaches. | ||
| + </li> | ||
| + <li> | ||
| + <a href="">Increased certainty</a> of water availability, especially | ||
| + in areas of intensive water use subject to chronic water scarcity. | ||
| + </li> | ||
| + </ul> | ||
| </div> | ||
| </div> | ||
| Delta | 47 lines added, 94 lines removed, 47-line decrease |
|---|