Merge branch 'development'

OpenArabicPE · Sep 10, 2020 · 8da1203 · 8da1203
2 parents baa49e6 + 8853cc8
commit 8da1203
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 11 deletions.
diff --git a/boilerplate/css/teibp_custom.css b/boilerplate/css/teibp_custom.css
@@ -20,7 +20,7 @@
 
 /* provide a readable page-width and center it on screen */
 html{
-    width:800px;
+    width: 1100px;
     margin-left:auto;
     margin-right:auto;
     margin-top:0;

diff --git a/boilerplate/css/teibp_facsimile.css b/boilerplate/css/teibp_facsimile.css
@@ -10,13 +10,29 @@ pb[ed = "shamela"]{
 }
 
 /* provide a new and broader width and override other settings */
-html {
-	width: 1100px !important;
-}
+/* the width of the two columns could be determined by a class */
+/* text column*/
 
-TEI > text {
+TEI > text,
+TEI > text > body {
 	width: 550px;
 }
+/*TEI > text.c_facsimily-only {
+	width: 200px;
+}*/
+TEI > text > body.c_facsimily-only {
+	width: 200px;
+}
+/* facsimile column */
+span.c_teibp-pbImgInfo {
+	display: block;
+}
+span.c_teibp-pbImgInfo {
+	width: 440px;
+}
+span.c_teibp-pbImgInfo.c_facsimily-only {
+	width: 740px;
+}
 
 /* Move rtl text right and the facsimile left */
 
@@ -98,10 +114,6 @@ span.c_teibp-pbLine {
 }
 
 /* the block containing the images  */
-span.c_teibp-pbImgInfo {
-	display: block;
-	width: 440px;
-}
 
 TEI > text[lang = "ar"] span.c_teibp-pbImgInfo,
 TEI > text[lang = "ota"] span.c_teibp-pbImgInfo,
@@ -126,7 +138,7 @@ TEI > text[lang *="ota-Latn-"] span.c_teibp-pbImgInfo {
 /* the images themselves */
 span.c_teibp-pb img {
 	display: block;
-	width:430px;
+	width: 95%;
 	height: 100% !important;
 	/*max-height: 100% !important;*/
 	border-style: none;

diff --git a/boilerplate/css/teibp_tei-elements.css b/boilerplate/css/teibp_tei-elements.css
@@ -76,6 +76,7 @@ l {
 /* divisions */
 
 div {
+    width: inherit;
 }
 
 /* paragraphs */

diff --git a/boilerplate/xslt/teibp_main.xsl b/boilerplate/xslt/teibp_main.xsl
@@ -85,6 +85,17 @@
                 <xsl:with-param name="pInput" select="."/>
             </xsl:call-template>
             <xsl:apply-templates select="@*"/>
+            <!-- add class attribute -->
+            <!-- <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$p_facsimile-only = true()">
+                        <xsl:text>c_facsimily-only</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="$p_facsimile-only = false()">
+                        <xsl:text>c_text-and-facsimily</xsl:text>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute> -->
             <xsl:apply-templates select="child::node()[not(self::tei:back)]"/>
             <xsl:choose>
                 <xsl:when test="child::tei:back">
@@ -101,6 +112,23 @@
             </xsl:choose>
         </xsl:copy>
     </xsl:template>
+    <xsl:template match="tei:body">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <!-- class to determine the width -->
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$p_facsimile-only = true()">
+                        <xsl:text>c_facsimily-only</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="$p_facsimile-only = false()">
+                        <xsl:text>c_text-and-facsimily</xsl:text>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template> 
     <xsl:template match="tei:back">
         <xsl:copy>
             <xsl:call-template name="templHtmlAttrLang">

diff --git a/boilerplate/xslt/teibp_parameters.xsl b/boilerplate/xslt/teibp_parameters.xsl
@@ -41,6 +41,8 @@
     <xsl:param name="p_color-scheme" select="'red'"/>
     <!-- parameter to select the mimeType. In some cases tiff might be more efficient than jpeg -->
     <xsl:param name="p_mimetype" select="'image/tiff'"/>
+    <!-- toggle the width of the columns. If set to true(), the facsimiles will take up most of the available space -->
+    <xsl:param name="p_facsimile-only" select="false()"/>
 
     <!-- original TEI Boilerplate stuff -->
     <xsl:param name="teibpHome" select="'http://dcl.slis.indiana.edu/teibp/'"/>

diff --git a/boilerplate/xslt/teibp_pb.xsl b/boilerplate/xslt/teibp_pb.xsl
@@ -155,7 +155,18 @@
             <!-- span to draw a horizontal divider -->
             <span class="c_teibp-pbLine"> </span>
             <!-- span to act as container for information and facsimiles-->
-        <span class="c_teibp-pbImgInfo">
+        <span>
+            <xsl:attribute name="class">
+                <xsl:text>c_teibp-pbImgInfo </xsl:text>
+                <xsl:choose>
+                    <xsl:when test="$p_facsimile-only = true()">
+                        <xsl:text>c_facsimily-only</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="$p_facsimile-only = false()">
+                        <xsl:text>c_text-and-facsimily</xsl:text>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
             <!-- span containing all information on the page and the facsimile -->
             <span class="c_teibp-pageNum" lang="{$v_lang-interface}">
                 <!-- this should be a back-link -->