More theming adjustments

Ukrainian-History · Jan 10, 2020 · 390680a · 390680a
1 parent 64726a4
commit 390680a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/css/viewer.css b/css/viewer.css
@@ -787,7 +787,7 @@ input {
 
     #header {
         width: auto;
-        padding: 0 15px;
+        padding: 0 20px 0 0 !important;
     }
 
     #footer {
@@ -796,7 +796,6 @@ input {
     }
 
     #main {
-        padding: 0 1% 0 1%;
         width: 95%;
         height: 820px !important;
     }
@@ -806,7 +805,6 @@ input {
         margin: 0 !important;
         float: left;
         position: relative;
-        padding: 0 15px;
     }
 
     #holder-panel {

diff --git a/drupal-adaptors/ohms_adapter/templates/node--ohms_audio.tpl.php b/drupal-adaptors/ohms_adapter/templates/node--ohms_audio.tpl.php
@@ -35,16 +35,23 @@
     $filename = field_get_items("node", $node, 'field_ohms_filename')[0]['value']; ?>
 
   <div class="audio-node-wrapper clearfix">
+  <div class="audio-player-wrapper">
+  <?php print render($content['body']); ?>
   <iframe 
     id="ohms-viewer" 
     name="ohms-viewer"
     title="Audio player"
     src="/ohms-drupal/viewer.php?cachefile=<?php print $filename;?>"
     scrolling="no"></iframe>
 
+  </div> <!-- audio-player-wrapper -->
+
   <div class="audio-metadata">
-  <?php endif; 
-  print render($content['body']); 
+
+  <?php else:
+    print render($content['body']);
+  endif; 
+
   // We hide the comments and links now so that we can render them later.
   hide($content['comments']);
   hide($content['links']);

diff --git a/drupal-adaptors/ohms_adapter/templates/ohms_audio.css b/drupal-adaptors/ohms_adapter/templates/ohms_audio.css
diff --git a/tmpl/search.tmpl.php b/tmpl/search.tmpl.php
@@ -77,20 +77,3 @@
 endif;
 ?>
 <span id="alert"></span>
-<form id="search-form" onSubmit="return false;" name="search-form" class="preview-search-form">
-    <fieldset>
-        <legend align="center" id="search-legend"><span class="search-label">Search this <?php echo $searchThisLabel ?></span>
-            <span class="search-show-info"><i class="fa fa-lg fa-caret-right"></i></span>
-            <span class="search-hide-info"><i class="fa fa-lg fa-caret-down"></i></span>
-        </legend>
-        <div class="search-content">
-            <label for="kw" style="display:none;">Search keyword field</label>
-            <input class="kw-empty" title="Search keyword field" id="kw" name="kw" size="30" value="Keyword"/>
-            <button class="search-button" id="submit-btn">Go</button>
-            <a href="#" class="searchclear-button" id="clear-btn">X</a>
-            <div id="search-results"></div>
-        </div>
-    </fieldset>
-</form>
-
-
diff --git a/tmpl/viewer.tmpl.php b/tmpl/viewer.tmpl.php
@@ -76,7 +76,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
     <title><?php echo $interview->title; ?></title>
-    <link rel="stylesheet" href="css/viewer.css?v1.4.6" type="text/css"/>
+    <link rel="stylesheet" href="css/viewer.css" type="text/css"/>
     <?php if (isset($extraCss)) { ?>
         <link rel="stylesheet" href="css/<?php echo $extraCss ?>" type="text/css"/>
     <?php }