fix typo (thanks christoph2806!), empty state

MyEtherWallet · May 31, 2016 · 0a7db82 · 0a7db82
1 parent bbabf2d
commit 0a7db82
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/app/includes/dao-proposals.tpl b/app/includes/dao-proposals.tpl
@@ -45,7 +45,8 @@
   </section>
   <!-- / DAO Filters -->
 
-        <article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator " >
+        <article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >
+
           <section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
             <div class="graph-container">
               <div class="graph-unfilled" style="width:100%"></div>
@@ -96,7 +97,7 @@
                   <em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
               </tr>
               <tr ng-show="objProposal.split==false">
-                <td class="label">Quroum:</td>
+                <td class="label">Quorum:</td>
                 <td class="output">
                   <div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
                 </td>
@@ -136,7 +137,12 @@
               <a class="btn btn-primary" ng-click="openVote(objProposal.id)">VOTE ON THIS PROPOSAL</a>
             </div>
           </section>
+
         </article>
+        <section class="no-items text-center">
+          <h4> Sorry...there are results with these filters. </h4>
+          <a class="btn btn-info" ng-class="filters=={} ? 'active' : ''" ng-click="filters={};">Show All Proposals</a>
+        </section>
 
   <!-- Vote Modal -->
   <div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sendTransactionLabel" id="voteProposal">

diff --git a/app/includes/daoProposalsEmbedded.tpl b/app/includes/daoProposalsEmbedded.tpl
@@ -3,7 +3,7 @@
 <br/><br/>
   <section class="proposal-container" ng-controller='theDaoProposalCtrl'>
     <!-- DAO Filters -->
-        <article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator " >
+        <article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >
           <section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
             <div class="graph-container">
               <div class="graph-unfilled" style="width:100%"></div>
@@ -52,7 +52,7 @@
                   <em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
               </tr>
               <tr ng-show="objProposal.split==false">
-                <td class="label">Quroum:</td>
+                <td class="label">Quorum:</td>
                 <td class="output">
                   <div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
                 </td>

diff --git a/app/styles/less/etherwallet-custom.less b/app/styles/less/etherwallet-custom.less
@@ -528,3 +528,18 @@ input[type="password"]+.eye {
 .input-group-addon {
   cursor: pointer;
 }
+
+article + .no-items {
+  display: none;
+}
+
+.no-items {
+  margin-top: 2em;
+  animation: fadein 1.5s;
+}
+
+@keyframes fadein {
+    0% { opacity: 0; }
+    70% { opacity: 0; }
+    100%   { opacity: 1; }
+}