From b532fe564e5a6fcd4d83fdb37bc1287a067d48f5 Mon Sep 17 00:00:00 2001
From: r <r@rdebian.rdebian>
Date: Sun, 3 Feb 2019 16:16:47 -0600
Subject: [PATCH] clarify smartblock OR vs AND

---
 .../scripts/form/smart-block-criteria.phtml   | 26 +++++++++----------
 airtime_mvc/public/css/media_library.css      |  3 +++
 airtime_mvc/public/css/playlist_builder.css   |  1 +
 airtime_mvc/public/css/styles.css             | 20 +++++++++++---
 .../js/airtime/playlist/smart_blockbuilder.js | 12 +++++++--
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 34c8375e6..7bee4b03a 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -26,34 +26,34 @@
                 $nextDisabled = $this->element->getElement("sp_criteria_field_".$nextIndex)->getAttrib('disabled') == 'disabled'?true:false;
         ?>
             <div <?php if (/*($i > 0) && */ $disabled) {
-                          echo 'style=display:none';
-                      } ?> >
+                          echo 'style="display:none"';
+                      }?> class="search-row-<?php echo $logicLabel ?>">
                 <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
                 <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j)   /* @todo finish this */?>
 
                 <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
                 <span class='sp_text_font' id="datetime_select" <?php echo $this->element->getElement("sp_criteria_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
 
-                <a class='btn btn-small btn-new' id='modifier_add_<?php echo $i ?>'>
-                    <i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?>
+                <a <?php if ($disabled) { echo 'style=display:none'; } ?>  class='modifier_add_link' id='modifier_add_<?php echo $i ?>'>
+                    + <?php echo(_("New Modifier")); ?>
                 </a>
-
+                
                 <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
                 <span class='sp_text_font' id="extra_datetime_select" <?php echo $this->element->getElement("sp_criteria_extra_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
-
+                
                 <a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'>
                     <i class='icon-white icon-remove spl-no-r-margin'></i>
                 </a>
-                <span class='db-logic-label' <?php if ($nextDisabled) echo "style='display:none'"?>>
+                <span class='db-logic-label<?php echo ' db-logic-label-' . $logicLabel; ?>' <?php if ($nextDisabled) echo 'style="display:none"';?>>
                     <?php echo $logicLabel;?>
                 </span>
-
+                
                 <?php if($this->element->getElement("sp_criteria_field_".$i."_".$j)->hasErrors()) : ?>
-                    <?php foreach($this->element->getElement("sp_criteria_field_".$i."_".$j)->getMessages() as $error): ?>
-                    <span class='errors sp-errors'>
-                       <?php echo $error; ?>
-                    </span>
-                    <?php endforeach; ?>
+                <?php foreach($this->element->getElement("sp_criteria_field_".$i."_".$j)->getMessages() as $error): ?>
+                <span class='errors sp-errors'>
+                    <?php echo $error; ?>
+                </span>
+                <?php endforeach; ?>
                 <?php endif; ?>
             </div>
             <?php } ?>
diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css
index 7947bee37..82ef848c1 100644
--- a/airtime_mvc/public/css/media_library.css
+++ b/airtime_mvc/public/css/media_library.css
@@ -216,7 +216,10 @@ tr.lib-selected > td > div.library_actions_btn:hover {
 
 .search-criteria .criteria-element > div {
 	margin-bottom: 5px;
+	display: flex;
+	position: relative;
 	}
+	.search-criteria .criteria-element > div.search-row-and { margin-bottom: 36px; }
 	.search-criteria .criteria-element > div input[type="text"],
 	.search-criteria .criteria-element > div select  {
 		-webkit-box-sizing: border-box;
diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css
index 0e344047a..a7751923d 100644
--- a/airtime_mvc/public/css/playlist_builder.css
+++ b/airtime_mvc/public/css/playlist_builder.css
@@ -533,6 +533,7 @@
 
 #sp_criteria-element {
     clear: both;
+    width: 100%;
 }
 
 /*
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 8327080a4..af356effa 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -703,15 +703,29 @@ table.library-get-file-md.table-small{
 
 
 /***** SMART BLOCK SPECIFIC STYLES BEGIN *****/
-.db-logic-label{
-    font-size:11px;
+.modifier_add_link {
+    font-size: 12px;
+    display: block;
+    margin: 0 0 10px 33%;
+    text-decoration: underline;
+    cursor: pointer;
+    position: absolute;
+    top: 30px;
+}
+.db-logic-label {
+    font-size:14px;
+    position: absolute;
+    top: 36px;
+}
+.db-logic-label-and {
+    top: 42px;
 }
 .sp-invisible{
     visibility: hidden;
 }
 
 .sp_input_select{
-    width: 140px;
+    flex: 0 0 33%;
 }
 
 .sp_input_text_limit{
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index 035567389..c4db72bf3 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -25,9 +25,13 @@ function setSmartBlockEvents() {
         } else {
 
             div.find('.db-logic-label').text('and').show();
+            div.removeClass('search-row-or').addClass('search-row-and');
+            
             div = div.next().show();
 
             div.children().removeAttr('disabled');
+            div.find(".modifier_add_link").show();
+
             div = div.next();
             if (div.length === 0) {
                 $(this).hide();
@@ -36,7 +40,7 @@ function setSmartBlockEvents() {
             appendAddButton();
             appendModAddButton();
             removeButtonCheck();
-            disableAndHideDateTimeDropdown(newRowVal);
+            // disableAndHideDateTimeDropdown(newRowVal);
 
         }
     });
@@ -76,8 +80,12 @@ function setSmartBlockEvents() {
         
         //remove the 'criteria add' button from new modifier row
         newRow.find('#criteria_add').remove();
-        
+
         $(this).parent().after(newRow);
+        
+        newRow.prev().removeClass('search-row-and').addClass('search-row-or');
+        newRow.prev().find(".db-logic-label").removeClass('db-logic-label-and').addClass('db-logic-label-or');
+
         reindexElements();
         appendAddButton();
         appendModAddButton();