[open-ils-commits] r9415 - in branches/acq-experiment: . Open-ILS/src Open-ILS/web/opac/skin/default/xml/rdetail

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-04-21 16:32:34 -0400 (Mon, 21 Apr 2008)
New Revision: 9415

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/Makefile
   branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
Log:
Merged revisions 9413-9414 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9413 | erickson | 2008-04-21 14:55:32 -0400 (Mon, 21 Apr 2008) | 1 line
  
  typo: nowarp -> nowrap
........
  r9414 | erickson | 2008-04-21 16:30:42 -0400 (Mon, 21 Apr 2008) | 1 line
  
  making sure directory is created
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9402
   + /trunk:1-9414

Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/Makefile	2008-04-21 20:30:42 UTC (rev 9414)
+++ branches/acq-experiment/Open-ILS/src/Makefile	2008-04-21 20:32:34 UTC (rev 9415)
@@ -69,7 +69,7 @@
 	mkdir -p $(ADMINDIR)
 	cp -r ../admin/* $(ADMINDIR)
 	mkdir -p $(WEBDIR)
-	mkdir -p $(WEBDIR)/js/opensrf/
+	mkdir -p $(WEBDIR)/js/dojo/opensrf/
 	mkdir -p $(WEBDIR)/opac/extras/xsl/
 	cp -r ../web/* $(WEBDIR)
 	cp $(OPENSRF_LIBS)/javascript/* $(WEBDIR)/opac/common/js/

Modified: branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml	2008-04-21 20:30:42 UTC (rev 9414)
+++ branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml	2008-04-21 20:32:34 UTC (rev 9415)
@@ -24,7 +24,7 @@
 				<td  class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.library;</td>
 				<td  class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.callnumber;</td>
 				<td  class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.actions;</td>
-				<td  nowrap='nowarp' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'> 
+				<td  nowrap='nowrap' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'> 
 					<div name='rdetail_status_cell'> </div>
 				</td>
 			</tr>