Remove empty popup titles

Author: Dylan McCall

python_env/src/cc.engine/cc/engine/templates/licenses/standard_deed.html

@@ -84,8 +84,7 @@ <h3>{% trans %}Creative Commons has <a href="http://creativecommons.org/retiredl
   <div id="deed-conditions" class="row">
     <h3 style="text-align: center">{% trans %}Under the following terms:{% endtrans %}</h3>
 
-    <ul dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}"
-        class="license-properties col-md-offset-2 col-md-8">
+    <ul dir="{{ get_ltr_rtl }}" style="{{ is_rtl_align }}" class="license-properties col-md-offset-2 col-md-8">
       {% if conditions['by'] %}
       <li class="license by">
           <p>
@@ -198,7 +197,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_mediation_and_arbitration_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}The applicable mediation rules will be designated in the copyright notice published with the work, or if none then in the request for mediation.  Unless otherwise designated in a copyright notice attached to the work, the UNCITRAL Arbitration Rules apply to any arbitration.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Intergovernmental_Organizations#What_should_I_know_before_I_use_a_work_licensed_under_the_IGO_3.0_ported_licenses.3F">
@@ -207,7 +205,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_appropriate_credit_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}If supplied, you must provide the name of the creator and attribution parties, a copyright notice, a license notice, a disclaimer notice, and a link to the material. CC licenses prior to Version 4.0 also require you to provide the title of the material if supplied, and may have other slight differences.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/License_Versions#Detailed_attribution_comparison_chart">
@@ -216,7 +213,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_indicate_changes_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}In 4.0, you must indicate if you modified the material and retain an indication of previous modifications. In 3.0 and earlier license versions, the indication of changes is only required if you create a derivative.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Best_practices_for_attribution#This_is_a_good_attribution_for_material_you_modified_slightly">
@@ -227,7 +223,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_same_license_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}You may also use a license listed as compatible at <a href="https://creativecommons.org/compatiblelicenses">https://creativecommons.org/compatiblelicenses</a>{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/FAQ#If_I_derive_or_adapt_material_offered_under_a_Creative_Commons_license.2C_which_CC_license.28s.29_can_I_use.3F">
@@ -236,7 +231,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_commercial_purposes_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}A commercial use is one primarily intended for commercial advantage or monetary compensation.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Does_my_use_violate_the_NonCommercial_clause_of_the_licenses.3F">
@@ -245,7 +239,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_some_kinds_of_mods_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}Merely changing the format never creates a derivative.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#When_is_my_use_considered_an_adaptation.3F">
@@ -254,7 +247,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_technological_measures_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}The license prohibits application of effective technological measures, defined with reference to Article 11 of the WIPO Copyright Treaty.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/License_Versions#Application_of_effective_technological_measures_by_users_of_CC-licensed_works_prohibited">
@@ -263,7 +255,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_exception_or_limitation_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}The rights of users under exceptions and limitations, such as fair use and fair dealing, are not affected by the CC licenses.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Frequently_Asked_Questions#Do_Creative_Commons_licenses_affect_exceptions_and_limitations_to_copyright.2C_such_as_fair_dealing_and_fair_use.3F">
@@ -272,7 +263,6 @@ <h3 style="text-align: center">
   </div>
 
   <div id="help_publicity_privacy_or_moral_rights_popup" class="help_panel">
-    <div class="hd">&nbsp;</div>
     <div class="bd">
       <p>{% trans %}You may need to get additional permissions before using the material as you intend.{% endtrans %}</p>
       <p><a href="http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees">

python_env/src/cc.engine/cc/engine/templates/macros_templates/deed.html

@@ -252,13 +252,13 @@ <h2>
         var popupId = helpId ? 'help_' + helpId : undefined;
         if (popupId) {
           var popupElem = $('#'+popupId);
-          var popupTitleElem = $('.hd', popupElem);
-          var popupBodyElem = $('.bd', popupElem);
+          var popupTitleHtml = $('.hd', popupElem).html();
+          var popupBodyHtml = $('.bd', popupElem).html();
           $(helpLinkElem).popover({
-            placement: 'bottom',
+            placement: 'auto bottom',
             trigger: 'focus',
-            title: popupTitleElem.html(),
-            content: popupBodyElem.html(),
+            title: popupTitleHtml ? popupTitleHtml : undefined,
+            content: popupBodyHtml ? popupBodyHtml : undefined,
             html: true
           });
         }