fix(obligations): missing closing bracket, improved form

fossology · Jun 28, 2017 · 2d147cf · 2d147cf
1 parent eb0f905
commit 2d147cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/lib/php/Application/ObligationCsvImport.php b/src/lib/php/Application/ObligationCsvImport.php
@@ -190,5 +190,6 @@ private function handleCsvObligation($row)
 
     return $return;
   }
+}
 
 }
diff --git a/src/www/ui/template/admin_obligation-upload_form.html.twig b/src/www/ui/template/admin_obligation-upload_form.html.twig
@@ -18,14 +18,14 @@
         {% if isReadOnly %}
           ({{ 'read only'|trans }}){% endif %}
       </td>
-      <td><input type="text" name="ob_topic" value="{{ ob_topic|e }}" size="30"></td>
+      <td><input type="text" name="ob_topic" value="{{ ob_topic|e }}" size="57"></td>
     </tr>
     <tr>
       <td align="right">{{ 'Type of obligation'|trans }}
         {% if isReadOnly %}
           ({{ 'read only'|trans }}){% endif %}
       </td>
-      <td align="left">{{ macro.select('ob_type', obligationTypes, 'ob_type', ob_type, 'style="min-width:420px;"', 4) }}
+      <td align="left">{{ macro.select('ob_type', obligationTypes, 'ob_type', ob_type, 'style="min-width:120px;"', 4) }}
       </td>
     </tr>
     <tr>
@@ -38,23 +38,23 @@
       </td>
     </tr>
     <tr>
-      <td align="right">{{ 'Level of attention</br> this obligation should raise</br> in the clearing process (optional)'|trans }}
+      <td align="right">{{ 'Optional: level of attention this obligation </br> should raise in the clearing process'|trans }}
         {% if isReadOnly %}
           ({{ 'read only'|trans }}){% endif %}
       </td>
-      <td align="left">{{ macro.select('ob_classification', obligationClassification, 'ob_classification', ob_classification, 'style="min-width:420px;"', 4) }}
+      <td align="left">{{ macro.select('ob_classification', obligationClassification, 'ob_classification', ob_classification, 'style="min-width:120px;"', 4) }}
       </td>
     </tr>
     <tr>
-      <td align="right">{{ 'Does it apply</br> on modified source code? (optional)'|trans }}</td>
+      <td align="right">{{ 'Optional: does this obligation apply</br> on modified source code?'|trans }}</td>
       <td align="left">{{ macro.select('ob_modifications',YesNoMap,'ob_modifications',ob_modifications) }}</td>
     </tr>
     <tr>
       <td align="right">{{ "Associated Licenses"|trans }}</td>
-      <td align="left">{{ macro.selectwitharray(licenseSelectorName, licenseShortnames, licenseSelectorId, licnames, 'style="min-width:420px;"', 8) }}</td>
+      <td align="left">{{ macro.selectwitharray(licenseSelectorName, licenseShortnames, licenseSelectorId, licnames, 'style="min-width:575px;"', 8) }}</td>
     </tr>
     <tr>
-      <td align="right">{{ 'Comment (optional)'|trans }}</td>
+      <td align="right">{{ 'Optional: comment'|trans }}</td>
       <td>
         <textarea name="ob_comment" rows="5" cols="80" {% if isReadOnly %} readonly="readonly" {% endif %}>{{ ob_comment  |e }}</textarea>
       </td>