Merge pull request #140 from flipside-org/develop

Small fixes
flipside-org · Jul 7, 2014 · 85fd199 · 85fd199
2 parents 9800e61 + 2f0c634
commit 85fd199
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/application/views/login.php b/application/views/login.php
@@ -43,12 +43,12 @@
       <?php if (ENVIRONMENT == 'demo') : ?>
       <div id="demo-users">
         <dl>
-        	<dt>agent</dt>
-        	<dd><span class="highlight">Password:</span> agent</dd>
+        	<dt>User: agent</dt>
+        	<dd><span class="highlight">Pass:</span> agent</dd>
         </dl>
         <dl>
-        	<dt>moderator</dt>
-        	<dd><span class="highlight">Password:</span> moderator</dd>
+        	<dt>User: moderator</dt>
+        	<dd><span class="highlight">Pass:</span> moderator</dd>
         </dl>
         More information can be found on the <a href="https://github.com/flipside-org/aw-datacollection/" title="View project on github.">project's github page.</a>
       </div>

diff --git a/application/views/surveys/survey_page.php b/application/views/surveys/survey_page.php
@@ -48,8 +48,8 @@
               <ul class="action-dropdown">
                 <?php if (has_permission('export csv data any survey')) : ?>
                 <?php $disabled = !$survey->has_xml() || !$survey->status_allows('export csv data any survey') ? 'disabled' : ''; ?>
-                <li><a href="<?= $survey->get_url_data_export_csv('csv_human'); ?>" class="<?= $disabled; ?>">Results</a></li>
-                <li><a href="<?= $survey->get_url_data_export_csv('csv_machine'); ?>" class="<?= $disabled; ?>">Results (Raw)</a></li>
+                <li><a href="<?= $survey->get_url_data_export_csv('csv_human'); ?>" class="<?= $disabled; ?>">Results (CSV)</a></li>
+                <li><a href="<?= $survey->get_url_data_export_csv('csv_machine'); ?>" class="<?= $disabled; ?>">Results raw (CSV)</a></li>
                 <?php endif; ?>
 
                 <?php if (has_permission('download any survey files')) : ?>

diff --git a/src/styles/_demo_styles.scss b/src/styles/_demo_styles.scss
@@ -93,7 +93,7 @@
   overflow: hidden;
   background-color: palette(blue);
   box-shadow: 0 4px 0 0 rgba(69, 77, 83, 0.1);
-  transform: rotate(45deg);
+  @include transform(rotate(-45deg));
   white-space: nowrap;
 
   a {