SlatePermutate Changeset - c67f6e823b4d · protofusion repositories

Changeset - c67f6e823b4d

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Ethan Zonca - 14 years ago 2011-10-14 22:22:39
ez@ethanzonca.com

Updated share dialog fixing bug 89, URL hidden by default to maintain consistent formatting

4 files changed with 10 insertions and 4 deletions:

inc/class.page.php

inc/class.schedule.php

scripts/displayTables.js

styles/output.css

0 comments (0 inline, 0 general)

inc/class.page.php

➞

Show inline comments

@@ @@ -312,25 +312,26 @@ class page @@
   	 '        <div id="leftfoot">'. PHP_EOL .
 	 '          <a href="feedback.php">Contact Us</a>'. PHP_EOL .
          '        </div>'. PHP_EOL .
          '        <div id="rightfoot">'. PHP_EOL .
          '          <h5>&copy; 2011 <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br /><a href="http://ethanzonca.com">Ethan Zonca</a><br /><a href="http://ohnopub.net">Nathan Phillip Brink</a><br /></h5>'. PHP_EOL .
 	 '        </div>'. PHP_EOL .
          '      </div> <!-- id="footer" -->'. PHP_EOL .
          '    </div> <!-- id="page" -->'. PHP_EOL;
     echo $this->trackingcode;
     echo '  </body>'. PHP_EOL .
          '</html>' . PHP_EOL;
     $this->pageGenTime = round(microtime() - $this->pageGenTime,4);
     echo '<!-- Page generated in ' . $this->pageGenTime . ' seconds -->';
     echo '<!-- Page generated in ' . $this->pageGenTime . ' seconds -->' . PHP_EOL;
+  }
   /**
    * \brief
    *   Shows a box with recently processed schedules
    */
   public function showSavedScheds($session) {
     global $clean_urls;
     if (isset($session['saved']) && count($session['saved']) > 0) {
       echo '<div id="savedBox" class="note saved">' . PHP_EOL;

inc/class.schedule.php

➞

Show inline comments

@@ @@ -489,25 +489,26 @@ class Schedule @@
       echo '    jQuery(\'#printItems\').click( function() {
 		  window.location = "'.$_SERVER['SCRIPT_NAME'].'?s='.$this->id_get().'&amp;print=" + (jQuery(\'#tabs\').tabs(\'option\',\'selected\') + 1);
 	        });
 	        jQuery(\'#cancelItems\').click( function() {
 		  jQuery(\'#selectItemsInput\').hide();
 	        });'
 	. '    ' . PHP_EOL
 	. '    jQuery(\'.cute-time\').cuteTime();' . PHP_EOL
 	. '  });' . PHP_EOL
 	. '        </script>' . PHP_EOL;
       echo '        <div id="sharedialog" title="Share Schedule">' . PHP_EOL
 	. '          <p class="indent"><img alt="[fb]" class="noborder" src="http://facebook.com/favicon.ico" /> <a href="http://www.facebook.com/sharer.php?u=' . urlencode(htmlentities($outputPage->gen_share_url($this->id_get()))) .'&amp;t=My%20Schedule">Share on Facebook</a></p><p class="indent">You can also share your schedule with the URL below:<br /><em class="centeredtext smallurl">' . htmlentities($outputPage->gen_share_url($this->id_get())) . '</em></p>' . PHP_EOL
 	. '          <p class="indent"><img alt="[fb]" class="noborder" src="http://facebook.com/favicon.ico" /> <a href="http://www.facebook.com/sharer.php?u=' . urlencode(htmlentities($outputPage->gen_share_url($this->id_get()))) .'&amp;t=My%20Schedule">Share on Facebook</a></p>
 		     <p class="indent"><img alt="[sp]" class="noborder" src="images/favicon.png" style="margin-right: 5px;"/><span class="clicktoclipboard"><a href="#">Share with URL</a><span class="toclipboard hidden"><p>Copy the share URL below:<br /><em class="centeredtext smallurl">' . htmlentities($outputPage->gen_share_url($this->id_get())) . '</em></p></span></span></p>' . PHP_EOL
 	. '        </div>' . PHP_EOL
 	. '        <p>' . PHP_EOL
 	. '          <a href="input.php?s='.$this->id.'" class="button">Edit</a>' . PHP_EOL
 	. '          <span id="printItems"><a href="#" class="button">Print</a></span>' . PHP_EOL
 	. '          <span id="share"><a href="#" class="button">Share</a></span>' . PHP_EOL;
       if ($schedule_store !== NULL
 	  && $this->parent_get() !== NULL
 	  && ($parent_schedule = schedule_store_retrieve($schedule_store, $this->parent_get())) !== NULL)
 	echo '          <a class="button" href="' . htmlentities($parent_schedule->url()) . '" title="Parent schedule: ' . htmlentities($parent_schedule->getName()) . '">Parent</a>' . PHP_EOL;

scripts/displayTables.js

➞

Show inline comments

@@ @@ -138,15 +138,19 @@ jQuery(document).ready( function() @@
           style: {
             tip: true,
             classes: "ui-tooltip-dark ui-tooltip-shadow ui-tooltip-rounded"
           },
           hide: {
             event: 'mouseleave click'
           },
           position:{
             my: 'bottom left',
             at: 'top center',
+          }
       });
       jQuery(".clicktoclipboard").click( function() {
         jQuery('.toclipboard', this).toggle();
       });
+  }
 );

styles/output.css

➞

Show inline comments

 /*
- * Copyright 2010 Nathan Gelderloos, Ethan Zonca, Nathan Phillip Brink
+ * Copyright 2011 Nathan Gelderloos, Ethan Zonca, Nathan Phillip Brink
+ *
  * This file is part of SlatePermutate.
+ *
  * SlatePermutate is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
+ *
  * SlatePermutate is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
@@ @@ -78,25 +78,25 @@ td{ @@
   background: #F0F0F0;
+}
 .prof,
 .location,
 .synonym
+{
     color: #444444;
     font-size: small;
+}
 /* Class Coloring */
+.multi {  }
 .class0 { background: #69c76f; }
 .class1 { background: #c5c769; }
 .class2 { background: #c76b69; }
 .class3 { background: #696fc7; }
 .class4 { background: #69a7c7; }
 .class5 { background: #c769c6; }
 .class6 { background: #989898; }
 .class7 { background: #e8e8e8; }
 .class8 { background: #111111; color: #fff; }
 .class9 { background: #00437d; color: #fff; }
 .class10 { background: #7e2400; color: #fff; }
 .permuteNum { border-bottom: 1px solid #000; font-weight: bold; color: #fff; background: #222; }

0 comments (0 inline, 0 general)