needs testing, but attempt to remove breaking button on planning submissions for AUP / SUP

public/templates/panels/requirements/city/planning_permit.html

@@ -63,7 +63,7 @@ <h4>Is your use prohibited?<br>Choose a different location.</h4>
 
         <% } else { %>
 
-        <p class="lead success">The use permit you need is a <em>Zoning Clearance</em>. You&rsquo;ll need to submit it to the Planning Department, and the fee is <strong>$221.00</strong>.</p>
+        <p class="lead">The planning permit you need is a <em>Zoning Clearance</em>. You&rsquo;ll need to submit it to the Planning Department, and the fee is <strong>$221.00</strong>.</p>
 
         <p class="lead">We'll need this additional information:</p>
         <form method="post" action="#" id="form_zoning_clearance">
@@ -124,17 +124,15 @@ <h4>Is your use prohibited?<br>Choose a different location.</h4>
         </form>
 
         <% } %>
-
-
-<!-- Ruthie, looks like you're still working on this. If the code returns "2" for AUP or "3" for SUP, it can return the same form info, as AUP and SUP use the same unified land use application and you can use the code under the else statment at 130 and clean-up / remove the conditionals down at line 199 ("talk to a planner")-->        
+
 
       <% } else { %>
 
-        <p>You&rsquo;ve told us that you&rsquo;re <strong>working from a commercial space</strong> at <strong><%= answers.business_physical_address_street %></strong>, and your business is categorized as <strong><%= answers.CIC_industry_subindustry %> (code <%= answers.CIC_code %>)</strong></p>
+        <p class="lead">You&rsquo;ve told us that you&rsquo;re <strong>working from a commercial space</strong> at <strong><%= answers.business_physical_address_street %></strong>, and your business is categorized as <strong><%= answers.CIC_industry_subindustry %> (code <%= answers.CIC_code %>)</strong></p>
 
         <% if (answers.required_permit.permit == "1") { %>
 
-          <p>This use is principally permitted, so you&rsquo;ll need a <em>Zoning Clearance</em>. You&rsquo;ll need to submit it to the Planning Department, and the fee is <strong>$221.00</strong>.</p>
+          <p class="lead">This use is principally permitted, so you&rsquo;ll need a <em>Zoning Clearance</em>. You&rsquo;ll need to submit it to the Planning Department, and the fee is <strong>$221.00</strong>.</p>
 
           <p class="lead">We'll need this additional information:</p>
           <form method="post" action="#" id="form_zoning_clearance">
@@ -201,7 +199,7 @@ <h4>Is your use prohibited?<br>Choose a different location.</h4>
 
         <% } else if (answers.required_permit.permit == "2") { %>
 
-          <p>This use is conditionally permitted, so you&rsquo;ll need an <em>Administrative Use Permit</em>.</p>
+          <p class="lead">This use is conditionally permitted, so you&rsquo;ll need an <em>Administrative Use Permit</em>.</p>
 
 
           <p class="lead">We'll need this additional information:</p>
@@ -383,21 +381,21 @@ <h4>Is your use prohibited?<br>Choose a different location.</h4>
 
  </div>
 
-            <div class="span4">
+          <!--  <div class="span4">
               <div class="well">
                 <p class="lead">I hereby certify that the facts given on this application are true and correct to the best of my knowledge and I agree to, and authorize, such investigations as are deemed necessary by the City of Santa Curz City Planning Department for the preparation of reports related to this application, including the right of access to the property involved. In submitting this application I agree to hold the City of Santa Cruz harmless from all costs and expenses, including litigations costs and attornet's fees incurred by the City of held to be the City's responsibility in connection with the City's defense of its actions taken in connection with the project which is subject of this application" (Signed and dated)</p>
                 <p class="next lead"><a class="btn btn-large btn-info" href="/location/check">Yes <%= (answers.is_owner === "true") ? "I" : "the owner" %> will comply with all these rules &rarr;</a></p>
                 <p class="next lead"><a class="btn btn-large btn-info" href="/help">No, <%= (answers.is_owner === "true") ? "I" : "the owner" %> might not be able comply with these terms. &rarr;</a></p>
               </div>
             </div>
-
+          -->
           </div>
 
   </form>
 
         <% } else if (answers.required_permit.permit == "3") { %>
 
-          <p>This use is conditionally permitted, so you&rsquo;ll need a <em>Special Use Permit</em>.
+          <p class="lead">This use is conditionally permitted, so you&rsquo;ll need a <em>Special Use Permit</em>.
 
           <p class="lead">We'll need this additional information:</p>
 <!-- check this Ruthie, don't want to mess this up-->
@@ -575,27 +573,27 @@ <h4>Is your use prohibited?<br>Choose a different location.</h4>
               <div class="controls"><input type="text" name="building_new_structure" placeholder="Yes or No" value="<%= answers.building_new_structure %>"></div>
             </div> 
 
-
+<!--
               <div class="form-submit">
                 <p class="lead">I hereby certify that the facts given on this application are true and correct to the best of my knowledge and I agree to, and authorize, such investigations as are deemed necessary by the City of Santa Curz City Planning Department for the preparation of reports related to this application, including the right of access to the property involved. In submitting this application I agree to hold the City of Santa Cruz harmless from all costs and expenses, including litigations costs and attornet's fees incurred by the City of held to be the City's responsibility in connection with the City's defense of its actions taken in connection with the project which is subject of this application" (Signed and dated)</p>
                 <p class="next lead"><a class="btn btn-large btn-info" href="/location/check">Yes <%= (answers.is_owner === "true") ? "I" : "the owner" %> will comply with all these rules &rarr;</a></p>
                 <p class="next lead"><a class="btn btn-large btn-info" href="/help">No, <%= (answers.is_owner === "true") ? "I" : "the owner" %> might not be able comply with these terms. &rarr;</a></p>
               </div>
             </div>
-
+-->          
           </div>
 
   </form>      
 
 
         <% } else if (answers.required_permit.permit == "4") { %>
 
-          <p>We&rsquo;re sorry, but businesses of this type are prohibited in this zoning district. <a href="/help" class="btn btn-large">Talk to a planner for next steps &rarr;</a></p>
+          <p class="lead">We&rsquo;re sorry, but businesses of this type are prohibited in this zoning district. <a href="/help" class="btn btn-large">Talk to a planner for next steps &rarr;</a></p>
 
         <% } else if (answers.required_permit.permit == "5") { %>
 
-          <p>We&rsquo;re sorry, but right now OpenCounter can&rsquo;t automatically determine what type of use permit you need.</p>
-          <p>Help us make OpenCounter smarter: please <a href="/help">contact the Planning Department</a>, and they&rsquo;ll help you -- and OpenCounter! -- figure out which type of use permit you need. Thank you for helping out the next person!</p>
+          <p class="lead">We&rsquo;re sorry, but right now OpenCounter can&rsquo;t automatically determine what type of use permit you need.</p>
+          <p class="lead">Help us make OpenCounter smarter: please <a href="/help">contact the Planning Department</a>, and they&rsquo;ll help you -- and OpenCounter! -- figure out which type of use permit you need. Thank you for helping out the next person!</p>
           <% if (answers.required_permit.notes) { %><p>Some notes: <%= answers.required_permit.notes %></p><% } %>
 
         <% } %>

public/templates/panels/requirements/city/sign_permit.html

@@ -15,7 +15,7 @@ <h3 class="toggle">Read Santa Cruz Municipal Code 24.12.300 <br>It won't take lo
   <blockquote class="drawer">
     <ol>
       <li><strong>Intent</strong>: Regulations in this ordinance governing signs (not in public right-of-way) are established in order to: Accommodate the community's need to communicate political, civic, public service, religious and other noncommercial messages with a minimum of restraint and to regulate commercial signs; Protect the aesthetic amenities on which the city's economy and quality of life depend; Promote traffic safety and minimize structural hazards posed by unsafe signs; Achieve consistency between General Plan goals and regulations dealing with size, location and content of exterior signs. (Ord. 85-05 &#167; 1 (part), 1985)</li>
-      <li><strong>Classiciation and Regulation</strong>: The zoning administrator shall designate an appropriate classification from the following categories (Sections 24.12.320 through 24.12.342 inclusive) for each sign. Disputes concerning the proper sign category may be appealed to the zoning board. In calculating the area of signs, only one side of a two sided sign shall be counted if the parallel planes are not more than twenty inches apart. Time and temperature devices are not included in the sign area, but may not exceed twenty percent of the allowed sign area.(Ord. 85-05 &#167; 1 (part), 1985)</li>
+      <li><strong>Classification and Regulation</strong>: The zoning administrator shall designate an appropriate classification from the following categories (Sections 24.12.320 through 24.12.342 inclusive) for each sign. Disputes concerning the proper sign category may be appealed to the zoning board. In calculating the area of signs, only one side of a two sided sign shall be counted if the parallel planes are not more than twenty inches apart. Time and temperature devices are not included in the sign area, but may not exceed twenty percent of the allowed sign area.(Ord. 85-05 &#167; 1 (part), 1985)</li>
       <li>
         <strong>Freestanding Signs Five Feet or Under</strong>:Freestanding signs five feet or less in height shall be permitted in all districts subject to the limitations in this chapter.
         <ol>

public/templates/panels/requirements/city/utility_services.html

@@ -150,6 +150,28 @@ <h3>Water, Sewage, and Trash Service</h3>
 <!-- this needs help in here and will be the basis of a calculator that has to flow over to the summary screen -->
 
   <p>Selection of Services</p>
+<<<<<<< HEAD
+
+      <div class="control-group">
+          <label class="control-label">Regular Garbage Services Size</label>
+          <div class="controls">
+            <input type="checkbox" name="trash_can_20_gal_qty" <% if (answers.trash_can_20_gal_qty) { %>checked="checked"<% } %>> 20 gallon garbage cans ($16.16/mo)
+            <input type="checkbox" name="trash_can_32_gal_qty"  <% if (answers.trash_can_32_gal_qty)  { %>checked="checked"<% } %>> 32 gallon garbage cans ($26.05/mo)
+            <input type="checkbox" name="trash_can_68_gal_qty"  <% if (answers.trash_can_86_gal_qty)  { %>checked="checked"<% } %>> 68 gallon garbage cans ($55.84/mo)
+            </div>
+      </div>
+
+      <div class="control-group">
+          <label class="control-label">Container Garbage Services Size</label>
+          <div class="controls">
+              <input type="checkbox" name="trash_container_1_cubic_yard_qty" <% if (answers.trash_container_1_cubic_yard_qty) { %>checked="checked"<% } %>> 1-cubic yard container ($160.42 per container per pickup)
+              <input type="checkbox" name="trash_container_2_cubic_yard_qty"  <% if (answers.trash_container_2_cubic_yard_qty)  { %>checked="checked"<% } %>> 2-cubic yard container ($239.11 per container per pickup)
+              <input type="checkbox" name="trash_container_4_cubic_yard_qty"  <% if (answers.trash_container_4_cubic_yard_qty)  { %>checked="checked"<% } %>> 4-cubic yard container ($408.94 per container per pickup)
+              <input type="checkbox" name="trash_container_6_cubic_yard_qty"  <% if (answers.trash_container_6_cubic_yard_qty)  { %>checked="checked"<% } %>> 6-cubic yard container ($578.77 per container per pickup)
+            </div>
+      </div>
+
+=======
     <div class="control-group">
       <label class="control-label">Regular Garbage Services Size</label>
       <div class="controls">
@@ -168,6 +190,7 @@ <h3>Water, Sewage, and Trash Service</h3>
         <input type="checkbox" name="trash_container_6_cubic_yard_qty"  <% if (answers.trash_container_6_cubic_yard_qty)  { %>checked="checked"<% } %>> 6-cubic yard container ($578.77 per container per pickup)
       </div>
     </div>
+>>>>>>> 4dfbd6cbe943f42790cb7500302520a02734608a
   </form>
 
   <div class="form-submit">