diff --git a/Handler/Query.hs b/Handler/Query.hs index 3dc8ab2..c27c030 100644 --- a/Handler/Query.hs +++ b/Handler/Query.hs @@ -110,9 +110,10 @@ resultTable (Entity submissionId submission) = do $(widgetFile "result-table") -queryResult :: FullSubmissionInfo -> WidgetFor App () -queryResult submission = do - $(widgetFile "query-result") + +submissionHeader :: FullSubmissionInfo -> WidgetFor App () +submissionHeader submission = + $(widgetFile "submission-header") where commitSha1AsText = fromSHA1ToText $ submissionCommit $ fsiSubmission submission submitter = formatSubmitter $ fsiUser submission publicSubmissionBranch = getPublicSubmissionBranch $ fsiSubmissionId submission @@ -120,5 +121,9 @@ queryResult submission = do browsableUrl = browsableGitRepoBranch (fsiScheme submission) (fsiChallengeRepo submission) (challengeName $ fsiChallenge submission) publicSubmissionBranch stamp = T.pack $ show $ submissionStamp $ fsiSubmission submission +queryResult :: FullSubmissionInfo -> WidgetFor App () +queryResult submission = do + $(widgetFile "query-result") + queryForm :: Form Text queryForm = renderBootstrap3 BootstrapBasicForm $ areq textField (fieldSettingsLabel MsgGitCommitSha1) Nothing diff --git a/templates/query-result.hamlet b/templates/query-result.hamlet index 609171e..57bff94 100644 --- a/templates/query-result.hamlet +++ b/templates/query-result.hamlet @@ -3,34 +3,7 @@
-
#{repoUrl $ fsiRepo submission}
/ branch #{repoBranch $ fsiRepo submission}
- $if submissionIsPublic $ fsiSubmission submission
- #{publicSubmissionRepo}
/ branch #{publicSubmissionBranch}
- git clone --single-branch #{publicSubmissionRepo} -b #{publicSubmissionBranch}
- $if not (null (fsiExternalLinks submission))
-
+ ^{submissionHeader submission}
^{resultTable (Entity (fsiSubmissionId submission) (fsiSubmission submission))}
$if not (null (fsiSuperSubmissions submission))
diff --git a/templates/submission-header.hamlet b/templates/submission-header.hamlet
new file mode 100644
index 0000000..f5b68e6
--- /dev/null
+++ b/templates/submission-header.hamlet
@@ -0,0 +1,28 @@
+
+
#{repoUrl $ fsiRepo submission}
/ branch #{repoBranch $ fsiRepo submission}
+ $if submissionIsPublic $ fsiSubmission submission
+ #{publicSubmissionRepo}
/ branch #{publicSubmissionBranch}
+ git clone --single-branch #{publicSubmissionRepo} -b #{publicSubmissionBranch}
+ $if not (null (fsiExternalLinks submission))
+