WIP

olakunlevpn · Oct 20, 2024 · 21cff03 · 21cff03
1 parent 8f3b4b9
commit 21cff03
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/Olakunlevpn-JobSystem-1.1.3.zip → Olakunlevpn-JobSystem-1.1.4.zip b/Olakunlevpn-JobSystem-1.1.3.zip → Olakunlevpn-JobSystem-1.1.4.zip
diff --git a/upload/src/addons/Olakunlevpn/JobSystem/_data/templates.xml b/upload/src/addons/Olakunlevpn/JobSystem/_data/templates.xml
@@ -540,20 +540,20 @@
                     </div>
                 </div>
                 <div class="block-footer">
-                  <div class="text-2xl">
+                  <div class="text-2xl margin-top-10">
                       Status:  <xf:if is="$job.active">
                       <span class="label label--lightGreen">Active</span>
                       <xf:else />
                       <span class="label label--error">Inactive</span>
                   </xf:if>
                   </div>
 
-                    <div class="text-2xl">
+                    <div class="text-2xl margin-top-10 margin-bottom-10">
                         Reward:  ${{ $job.reward_amount }} {{ $job.RewardCurrency.title  }}
                     </div>
 
                     <hr>
-                    <a href="{{ link('jobs/view', $job) }}" class="button">Take This Job</a>
+                    <a href="{{ link('jobs/view', $job) }}" class="button text-2xl">Take This Job</a>
 
                 </div>
             </div>
@@ -703,7 +703,7 @@
             </div>
 
 
-        <div class="text-2xl block-row">
+        <div class="text-2xl block-row margin-top-10">
             Status:  <xf:if is="$job.active">
             <span class="label label--lightGreen">Active</span>
             <xf:else />
@@ -712,7 +712,7 @@
         </div>
 
 
-        <div class="text-2xl block-row">
+        <div class="text-2xl block-row margin-top-10">
             Reward:  ${{ $job.reward_amount }} {{ $job.RewardCurrency.title  }}
         </div>
 
@@ -756,30 +756,39 @@
         >
 
 
-            <!-- Conditionally display form for text or URL -->
-            <xf:if is="$job.type == 'text'">
-                <xf:textboxrow name="submission_text" label="Your Response" />
-                <xf:else />
-                <xf:textboxrow name="submission_url" label="Submission URL" />
-            </xf:if>
 
-            <!-- Conditionally display attachment upload if has_attachment is true -->
-            <xf:if is="$job.has_attachment">
-                <xf:formrow label="Upload Attachments" explain="Please attach any necessary files for this job.">
+            <xf:if is="$xf.visitor.user_id">
 
-                <xf:macro template="helper_attach_upload" name="upload_block"
-                          arg-attachmentData="{$attachmentData}"
-                          arg-forceHash="{$attachmentData.hash}"
-                          arg-hiddenName="attachment_hash" />
 
-                <xf:hiddenval name="attachment_hash" value="{$attachmentData.hash}" />
-                </xf:formrow>
-            </xf:if>
+                <!-- Conditionally display form for text or URL -->
+                <xf:if is="$job.type == 'text'">
+                    <xf:textboxrow name="submission_text" label="Your Response" />
+                    <xf:else />
+                    <xf:textboxrow name="submission_url" label="Submission URL" />
+                </xf:if>
+
+                <!-- Conditionally display attachment upload if has_attachment is true -->
+                <xf:if is="$job.has_attachment">
+                    <xf:formrow label="Upload Attachments" explain="Please attach any necessary files for this job.">
+
+                        <xf:macro template="helper_attach_upload" name="upload_block"
+                                  arg-attachmentData="{$attachmentData}"
+                                  arg-forceHash="{$attachmentData.hash}"
+                                  arg-hiddenName="attachment_hash" />
+
+                        <xf:hiddenval name="attachment_hash" value="{$attachmentData.hash}" />
+                    </xf:formrow>
+                </xf:if>
+
 
 
-            <xf:if is="$xf.visitor.user_id">
                 <xf:submitrow sticky="true" icon="payment" submit="Submit Job" />
+
                 <xf:else />
+                <div class="margin-bottom-10" style="text-align: center;">
+                <div  class="margin-bottom-10">
+                    Please login or register to participate
+                </div>
                 <a href="/login/" class="button button--icon  button--icon--write" data-xf-click="overlay" data-follow-redirects="on">
                     <i class="fa--xf far fa-user-circle">
                         <svg xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true">
@@ -796,6 +805,7 @@
                     </i>
                     <span class="button-text">Register</span>
                 </a>
+                </div>
             </xf:if>
 
 
@@ -1007,7 +1017,7 @@
   <template type="public" title="push_job_submission_tasks_pending" version_id="1000010" version_string="1.0.0 Alpha"><![CDATA[Your job submission for <strong>{$extra.jobTitle}</strong> is currently pending review. Please wait for updates.]]></template>
   <template type="public" title="push_job_submission_tasks_rejected" version_id="1000010" version_string="1.0.0 Alpha"><![CDATA[Your job submission for {$extra.jobTitle} has been rejected. Reason: {$extra.adminComment}.]]></template>
   <template type="public" title="styles.css" version_id="1000010" version_string="1.0.0 Alpha"><![CDATA[.text-2xl {
-     font-size: 17px;
+     font-size: 17px !important;
 }
 
 @keyframes spin {
@@ -1027,5 +1037,13 @@
 
 .margin-top-20{
      margin-top: 20px !important;
+}
+
+.margin-top-10{
+     margin-top: 10px !important;
+}
+
+.margin-bottom-10{
+     margin-bottom: 10px !important;
 }]]></template>
 </templates>
diff --git a/upload/src/addons/Olakunlevpn/JobSystem/addon.json b/upload/src/addons/Olakunlevpn/JobSystem/addon.json
@@ -2,8 +2,8 @@
     "legacy_addon_id": "Olakunlevpn_JobSystem",
     "title": "Job System",
     "description": "Simple tasks system for forum promotion",
-    "version_id": 1010030,
-    "version_string": "1.1.3",
+    "version_id": 1010040,
+    "version_string": "1.1.4",
     "dev": "Olakunlevpn",
     "dev_url": "https://maylancer.org",
     "faq_url": "",

diff --git a/upload/src/addons/Olakunlevpn/JobSystem/hashes.json b/upload/src/addons/Olakunlevpn/JobSystem/hashes.json
@@ -1,5 +1,5 @@
 {
-    "src/addons/Olakunlevpn/JobSystem/addon.json": "c94f8a400076e2f492556b93ce61f6fe881f9c1d257010f31c70cdd6602b7af5",
+    "src/addons/Olakunlevpn/JobSystem/addon.json": "ffd9c281785057a26a12fc6701379da36a2a6969071cf36834e293adaef09a4b",
     "src/addons/Olakunlevpn/JobSystem/Admin/Controller/Job.php": "8f89795896998dd6166c62b202927b060201571b6ebe0cbf8458ea8771a41827",
     "src/addons/Olakunlevpn/JobSystem/Admin/Controller/Submission.php": "fb31b52881d5a860ddfb78eba6e0a2d4ecc3635a5f0ec083269f2f8039ba7094",
     "src/addons/Olakunlevpn/JobSystem/Alert/JobHandler.php": "19b5f4b109154d1ae714935be8d21ef185333ee8c9ba4af9a3a123632db83afd",
@@ -38,7 +38,7 @@
     "src/addons/Olakunlevpn/JobSystem/_data/routes.xml": "b144b556a3f98bba760680e8d6a0e0a9c84447f823486a3f62f4f94450e4a052",
     "src/addons/Olakunlevpn/JobSystem/_data/style_properties.xml": "8b8690a8512f01f219dd2da76e3d0c5f62afc1f317b87794a7331c859c36a7a8",
     "src/addons/Olakunlevpn/JobSystem/_data/style_property_groups.xml": "68e1879cb3846c42d978487aa8d5145ff3335fc39e58016878824d5cf3fd684c",
-    "src/addons/Olakunlevpn/JobSystem/_data/templates.xml": "985e041e82a30ba2d6bfb3e77d212df70f383d7741dc8f1c7fd3026ddb742ef3",
+    "src/addons/Olakunlevpn/JobSystem/_data/templates.xml": "aaeb6072d3bf569a4226ac7a377efdfa95ebb5ca5060d8f9130c51d0ecb59ff9",
     "src/addons/Olakunlevpn/JobSystem/_data/template_modifications.xml": "3b54b7df00a6a4a18c5e012b6e2588e35c23aaa13a5fc227f08646a97590d778",
     "src/addons/Olakunlevpn/JobSystem/_data/widget_definitions.xml": "37e46965256430f24004c2e7f08ba08f9b0d1cbcc4d70e84b3f4e3ffb713e64b",
     "src/addons/Olakunlevpn/JobSystem/_data/widget_positions.xml": "a29cee66134f6bc5d75ed9df1eef21096c24401915c5b5c774389c3d7bb2d5b3"