From f5a01c61a6aed8afa3b86f1492d4bc4a381427ab Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 22 Nov 2014 19:51:49 +0100 Subject: [PATCH] webbuild: move most rpm buttons below the editor plus some other layout adjustements --- webbuild/webbuild-cgi | 112 ++++++++-------------------- webbuild/webbuild-functions-private | 69 ++++++++++++++--- 2 files changed, 91 insertions(+), 90 deletions(-) diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index e2fb2f9..2cb2064 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -1241,13 +1241,13 @@ fi if [ "$MAINTAINERMODE" != "true" ]; then echo -n "" [ "$PACKAGE" ] && { + echo -n "
" echo -n "Package: $PACKAGE
Version: " [ "${SPECVAR_Epoch[0]}" ] && echo -n "${SPECVAR_Epoch[0]}:" || echo -n "0:" - echo -n "${SPECVAR_Version[0]}-${SPECVAR_Release[0]}
" + echo -n "${SPECVAR_Version[0]}-${SPECVAR_Release[0]}
" } - echo -n "Target arch:" for f in i586 arm x86_64 ppc; do SELECTED= if [ "$f" = "$RPMBUILDARCH" ]; then @@ -1258,8 +1258,8 @@ if [ "$MAINTAINERMODE" != "true" ]; then echo -n "" done echo -n "" - echo -n "" - echo -n "" + echo -n " " + echo -n " " # destination repository select echo -n "
Send to:" echo -n "" + if [ "$AUTODISTJOBSELECTED" -a "$AUTODISTJOB" = "$PACKAGE" ]; then + echo -n "
You should use autodist for this package!" + fi if [ "$AUTODISTJOB" ]; then echo -n "
Job packages:" echo -n "" @@ -1458,88 +1461,26 @@ if [ "$MAINTAINERMODE" != "true" ]; then fi fi if [ "$PACKAGE" ]; then - echo -n "
RPM packaging commands:
" - # check for updates - echo -n "" - # unpack - echo -n "" - # build - echo -n "" - # unpackaged files - echo -n "" - # build requirements - echo -n "" + echo -n "
" + ## check for updates + #echo -n "" ## recreate SRPM #echo -n "" - # rpm checks - echo -n "" - echo -n "" - # rpm install - [ ! "$USER_CANINSTALL" ] && DISABLED="disabled=disabled" - echo -n "$PACKAGE in current environment?"`\"" - echo -n "); class=redbutton $DISABLED>" - # rpm send - if [ "$SPECVAR_CHECK_NOAUTOBUILDREQ" ]; then - HREFADD="disabled=disabled title=\"WARNING: fix specfile build requirements before you can send the package\"" - else - HREFADD= - fi - echo -n "$PACKAGE built packages to "`\"+getSelectedValueById('sendrepository')+" - echo -n "\"`cgi_encodevar "?

HINT: does summary look short and good?
${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}."`\"" - echo -n "); class=redbutton $HREFADD>" - # recreate and send SRPM - if [ "$SPECVAR_CHECK_NOAUTOBUILDREQ" ]; then - HREFADD="disabled=disabled title=\"WARNING: fix specfile build requirements before you can send the package\"" - else - HREFADD= - fi - echo -n "$PACKAGE source package only to "`\"+getSelectedValueById('sendrepository')+" - echo -n "\"`cgi_encodevar "?

WARNING: use this to refresh the SRPM of a package which already exists with same release in repository"`\"" - echo -n "); class=redbutton $HREFADD>" - # recreate SRPM before sending checkbox - echo -n "" # add patches - echo -n "
Add patches:" + echo -n "Add patches:" echo -n "" echo -n " pastebin
" - echo -n "URL:" + echo -n "URL:" echo -n "
$PACKAGE-${SPECVAR_Version}-" echo -n ".patch" echo -n "
" @@ -1552,11 +1493,12 @@ if [ "$MAINTAINERMODE" != "true" ]; then echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&" echo -n "UPLOADFILENAME=\"+encodeURIComponent(getElementById('fileToUpload').value));>Upload" echo -n "" - echo -n "
" + echo -n "
" # info from package sources + echo -n "
" echo -n "Info from package in the works:
" # show sources - echo -n "" # show patches - echo -n "" + # add a note + echo -n "" + echo -n "" + echo -n "" + echo -n "" # generic info echo -n "
Generic info:
" @@ -1609,7 +1560,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then echo -n "" # templates - echo -n "" # macros - echo -n "
" + echo -n "" fi echo -n "]]>" fi diff --git a/webbuild/webbuild-functions-private b/webbuild/webbuild-functions-private index b5a1052..6e51d7c 100644 --- a/webbuild/webbuild-functions-private +++ b/webbuild/webbuild-functions-private @@ -186,20 +186,69 @@ function print_editorcontrols() { echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&" echo -n "REQUEST=deletespec\",\"`cgi_encodevar "Really delete $PACKAGE.spec?"`\")>" # specfile rename - echo -n "" - echo -n ".spec" - # add a note - echo -n "" - echo -n "" - echo -n "" - echo -n "" + echo -n "AUTODISTARCH=\"+getSelectedValueById('rpmbuildarch')+\"&" + echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')" + echo -n ",\"`cgi_encodevar "Send $PACKAGE built packages to "`\"+getSelectedValueById('sendrepository')+" + echo -n "\"`cgi_encodevar "?

HINT: does summary look short and good?
${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}."`\"" + echo -n "); class=redbutton $HREFADD>" + # recreate and send SRPM + if [ "$SPECVAR_CHECK_NOAUTOBUILDREQ" ]; then + HREFADD="disabled=disabled title=\"WARNING: fix specfile build requirements before you can send the package\"" + else + HREFADD= + fi + echo -n "$PACKAGE source package only to "`\"+getSelectedValueById('sendrepository')+" + echo -n "\"`cgi_encodevar "?

WARNING: use this to refresh the SRPM of a package which already exists with same release in repository"`\"" + echo -n "); class=redbutton $HREFADD>" + # recreate SRPM before sending checkbox + echo -n "" + # specfile update echo -n "
" echo -n "