Changeset 35944

Timestamp:

Aug 14, 2013, 1:31:09 PM (13 years ago)

Author:

eugene

Message:

added some cleanup functions; added footnote ref to markdown; cleanup for css

Location:

branches/eam_branches/ipp-20130711/dvodist

Files:

• INSTALL (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• dvodist/ipp.css (modified) (1 diff)
• www-util/ipp.php (modified) (1 diff)

branches/eam_branches/ipp-20130711/dvodist/INSTALL

@@ -1 +1 @@
 
 after setting up psconfig:
+
+ippc11 / dvodist example
+ psconfigure --htdocs /export/ippc11.0/www/dvodist/ --rootdir /dvodist --rootwww http://dvodist.ipp.ifa.hawaii.edu
+ make dvodist
+ (or make dvodist-all)
 
 ippc17 / dvodist example

branches/eam_branches/ipp-20130711/dvodist/Makefile.in

@@ -1 +1 @@
 default: help
 help:
-        @echo "USAGE: make (website)"
-        @echo "  (website) = dvodist or ippdata"
+        @echo "USAGE: make (target)"
+        @echo "  targets: "
+        @echo "  dvodist : the internal dvo distribution website (info pages only)"
+        @echo "  dvodist-all : install pages for dvo data"
+        @echo "  ippdata : the public ipp data distribution website"
+        @echo ""
+        @echo "  clean-dvodist : remove generated php files"
+        @echo "  clean-ippdata : remove generated php files"
 
 GENERATE = src/generate --htdocs @HTDOCS@ --rootdir @ROOTDIR@ --rootwww @ROOTWWW@
@@ -20 +26 @@
 TGT-IPPDATA = @HTDOCS@/ippdata
 
-# common code used by all installation?
-UTIL = \
-$(TGT-UTIL)/blank.html \
+# generated common code used by all installations
+UTIL-MKD = \
 $(TGT-UTIL)/ipp.page.php \
-$(TGT-UTIL)/ipp.menu.dat \
 $(TGT-UTIL)/ipp.php \
 $(TGT-UTIL)/markdown.php \
 $(TGT-UTIL)/phptest.php
 
-DVODIST = \
-$(TGT-UTIL)/dvodist.menu.dat \
+# static common code used by all installations
+UTIL-RAW = \
+$(TGT-UTIL)/blank.html \
+$(TGT-UTIL)/ipp.menu.dat
+
+UTIL = $(UTIL-RAW) $(UTIL-MKD)
+
+# pages which are generated (and thus depend on the config)
+DVODIST-MKD = \
 $(TGT-UTIL)/dvodist.page.php \
-$(TGT-DVODIST)/PScolorlogo2.jpg \
 $(TGT-DVODIST)/index.php \
 $(TGT-DVODIST)/test.php \
 $(TGT-DVODIST)/docs.php \
 $(TGT-DVODIST)/help.php \
-$(TGT-DVODIST)/ipp.css \
 $(TGT-DVODIST)/catdir.syn.test/index.php \
 $(TGT-DVODIST)/catdir.syn.test/n3000/index.php \
 $(TGT-DVODIST)/catdir.syn.test/n3730/index.php
 
-IPPDATA = \
-$(TGT-UTIL)/ippdata.menu.dat \
+# pages which are copied directly
+DVODIST-RAW = \
+$(TGT-UTIL)/dvodist.menu.dat \
+$(TGT-DVODIST)/PScolorlogo2.jpg \
+$(TGT-DVODIST)/ipp.css
+
+DVODIST = $(DVODIST-MKD) $(DVODIST-RAW) 
+
+IPPDATA-MKD = \
 $(TGT-UTIL)/ippdata.page.php \
-$(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/index.php \
 $(TGT-IPPDATA)/docs/index.php \
 $(TGT-IPPDATA)/docs/photladder.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-csv/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-csv/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/n3000/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/n3730/index.php \
+$(TGT-IPPDATA)/help.php
+
+IPPDATA-RAW = \
+$(TGT-UTIL)/ippdata.menu.dat \
+$(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/docs/photladder-1206.20130301.pdf \
 $(TGT-IPPDATA)/docs/2mass.compare/dH.allsky.20120528.v3.png \
@@ -57 +85 @@
 $(TGT-IPPDATA)/docs/2mass.compare/sigma.g.ubercal.20120528.v0.png \
 $(TGT-IPPDATA)/docs/2mass.compare/sigma.i.ubercal.20120528.v0.png \
-$(TGT-IPPDATA)/photladder.20130107.subset/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/relphot-fits/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/relphot-csv/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-fits/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-csv/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/n3000/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/n3730/index.php \
-$(TGT-IPPDATA)/help.php \
 $(TGT-IPPDATA)/ipp.css
+
+IPPDATA = $(IPPDATA-RAW) $(IPPDATA-MKD)
 
 include $(SRC-DVODIST)/3pi.20120509/Makefile
@@ -128 +149 @@
 
 # utilities #################################################
+clean-dvodist:  
+        rm -f $(DVODIST-MKD) $(UTIL-MKD) $(DVODIST_DIRS)
+
+clean-ippdata:  
+        rm -f $(IPPDATA-MKD) $(UTIL-MKD)
+
 clean:  
         rm -f `find . -name "*.o"`

branches/eam_branches/ipp-20130711/dvodist/dvodist/ipp.css

@@ -37 +37 @@
 }
 
+#footnote {
+    overflow: auto;
+    text-align: right;
+    font-size: 60%;
+}
+
 a:link, a:visited, a:active { 
-    text-decoration: underline; 
+    text-decoration: none; 
     font-weight: bold; 
-    color: #ff0000
+    color: #505050
 }
 

branches/eam_branches/ipp-20130711/dvodist/www-util/ipp.php

@@ -129 +129 @@
 function menu_end () { 
   echo "</td></tr></table>\n";
+  echo "<div id=\"footnote\">\n";
+  echo "  Page Rendering by EAM with help from\n";
+  echo "  <a href=\"http://daringfireball.net/projects/markdown\">Markdown</a>\n";
+  echo "  <a href=\"http://michelf.com/projects/php-markdown\">PHP</a>\n";
+  // echo "  host: $root\n";
+  echo "</div>\n";
   echo "</body></html>\n\n";
   exit ();