diff options
32 files changed, 710 insertions, 30 deletions
diff --git a/bin/bkp/bkp_wiki.sh b/bin/bkp/bkp_wiki.sh index e8c5f0f1..d1c37ac2 100755 --- a/bin/bkp/bkp_wiki.sh +++ b/bin/bkp/bkp_wiki.sh @@ -15,7 +15,7 @@ then fi DEPLOY=$1 -DEPLOYFILE=`ls ./etc | grep $DEPLOY` +DEPLOYFILE=`ls ./etc | grep $DEPLOY | grep -v '.test' | grep -v '.old'` echo "#### DEPLOY: $DEPLOY" diff --git a/bin/reevotech/CreateSemanticObject.sh b/bin/reevotech/CreateSemanticObject.sh deleted file mode 100644 index 87dc64a9..00000000 --- a/bin/reevotech/CreateSemanticObject.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "This script is used to create a Semantic Object defined in a specific Deployment" -echo "" diff --git a/bin/reevotech/CreateSemanticObject/Case.tpl b/bin/reevotech/CreateSemanticObject/Case.tpl new file mode 100644 index 00000000..b6aa0a33 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Case.tpl @@ -0,0 +1,13 @@ +case:description|desc|Description +case:organization-name|text|Organizacion name +case:organization-url|url|Website +case:organization-email|email|E-Mail +case:info-authors|text|Authors +case:info-topics|text|Topics +case:info-participants|text|Number of participants +case:info-report|text|Case Report +case:place|geo|Place +case:place-country|country|Country +case:place-state|text|State +case:place-city|text|City +case:place-street|text|Street diff --git a/bin/reevotech/CreateSemanticObject/Report.tpl b/bin/reevotech/CreateSemanticObject/Report.tpl new file mode 100644 index 00000000..18dd034e --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report.tpl @@ -0,0 +1,7 @@ +report:info-series|text|Series +report:info-volume|number|Volume number +report:info-coordinators|text|Coordinators +report:info-date|date|Publication date +report:info-url|url|Official link +report:info-pdf|url|PDF Link +report:info-cover|url|Cover Link diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-coordinators.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-coordinators.mw new file mode 100644 index 00000000..9c476939 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-coordinators.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Text]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-cover.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-cover.mw new file mode 100644 index 00000000..9d5a8fcd --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-cover.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::URL]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-date.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-date.mw new file mode 100644 index 00000000..9a4a194b --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-date.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Date]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-pdf.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-pdf.mw new file mode 100644 index 00000000..9d5a8fcd --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-pdf.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::URL]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-series.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-series.mw new file mode 100644 index 00000000..9c476939 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-series.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Text]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-url.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-url.mw new file mode 100644 index 00000000..9d5a8fcd --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-url.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::URL]]. diff --git a/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-volume.mw b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-volume.mw new file mode 100644 index 00000000..cac533c1 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/Report/Property/Property:Report:info-volume.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Integer]]. diff --git a/bin/reevotech/CreateSemanticObject/run.sh b/bin/reevotech/CreateSemanticObject/run.sh new file mode 100755 index 00000000..a0671963 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/run.sh @@ -0,0 +1,117 @@ +#!/bin/bash +# Use: ./bin/reevotech/CreateSemanticObject/run.sh gta +# *************** THIS SCRIPT IS NOT FINISHEED!! +# +# This script is used to create a Semantic Object defined in a specific Deployment using our custom templates +# +# It receives a file with the following structure: +# +# objet:property|type|name in english|options +# +# case:description|desc|Description +# case:organization-name|text|Organizacion name +# case:organization-url|url|Website +# case:organization-email|email|E-Mail +# case:info-topics|text|Topics|value1,value2 +# case:info-participants|text|Number of participants +# case:info-report|text|Case Report +# case:place|geo|Place +# case:place-country|country|Country +# case:place-state|text|State +# case:place-city|text|City +# case:place-street|text|Street + +IFS=$'\n' +DEPLOY=$1 +FILE=$2 +OBJECT=`echo $2 | cut -d '.' -f1` + +CreateProperty() { + echo "I will create the Property pages for $OBJECT..." + mkdir "$OBJECT/Property" + + LANG_EN="../../../www/wiki/deployments/$DEPLOY/i18n/en.json" + cat $LANG_EN | head -n -2 > "$LANG_EN.new" + STRING_LAST=`cat $LANG_EN | head -n -1 | tail -n 1` + echo "$STRING_LAST," >> "$LANG_EN.new" + for i in `cat $FILE` + do + PROPERTY=`echo ${i} | cut -d '|' -f1` + PROPERTY2=`echo ${i^} | cut -d '|' -f1` + + TYPE=`echo $i | cut -d '|' -f2` + cp "tpl/Property/$TYPE.mw" "$OBJECT/Property/Property:$PROPERTY2.mw" + + STRING=`echo $i | cut -d '|' -f3` + + echo " \"rv-$PROPERTY\": \"$STRING\"," >> "$LANG_EN.new" + + + OPTIONS=`echo $i | cut -d '|' -f4` + if [ -z "$OPTIONS" ] + then + echo "\$OPTIONS is empty" > /dev/null + else + echo "" >> "$OBJECT/Property/Property:$PROPERTY.mw" + for j in ${OPTIONS//,/ } + do + echo "* [[Allows value::$j]]" >> "$OBJECT/Property/Property:$PROPERTY.mw" + done + fi + done + sed -i '$s/,$//' "$LANG_EN.new" + echo "}" >> "$LANG_EN.new" + mv "$LANG_EN.new" "$LANG_EN" + +} + +CreateTemplate () { + echo "I will create the Template pages for $OBJECT..." + mkdir "$OBJECT/Template" + TEMPLATE="$OBJECT/Template/Template:$OBJECT.mw" + echo "<noinclude> +<pre>" > $TEMPLATE + echo "{{$OBJECT" >> $TEMPLATE + for i in `tac $FILE` + do + PROPERTY=`echo ${i} | cut -d '|' -f1` + echo "|$PROPERTY=" >> $TEMPLATE + TYPE=`echo $i | cut -d '|' -f2` + case $TYPE in + "desc") + FIELD_DESC=$PROPERTY + ;; + "url") + FIELD_URL=$PROPERTY + ;; + "email") + FIELD_EMAIL=$PROPERTY + ;; + "phone") + FIELD_PHONE=$PROPERTY + ;; + "geo") + FIELD_GEO=$PROPERTY + ;; + esac + done + echo '}} +</pre> +<div class="intro-copete">' >> $TEMPLATE + +} + + +# Creates a subfolder for the new object +rm -rf $OBJECT +mkdir $OBJECT + +CreateProperty +cp $OBJECT/Property/* ../../../www/wiki/deployments/$DEPLOY/pages/Property/ +../PutPages.sh $DEPLOY Property + +# CreateTemplate + +# Abandoned here because template is very specific... + +/usr/bin/php ../../../www/wiki/maintenance/runJobs.php --conf /srv/reevotech/www/wiki/LocalSettings-$DEPLOY.php diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/country.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/country.mw new file mode 100644 index 00000000..01136d08 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/country.mw @@ -0,0 +1,258 @@ +This is a property of type [[Has type::Text]]. + +* [[Allows value::AC]] +* [[Allows value::AD]] +* [[Allows value::AE]] +* [[Allows value::AF]] +* [[Allows value::AG]] +* [[Allows value::AI]] +* [[Allows value::AL]] +* [[Allows value::AM]] +* [[Allows value::AO]] +* [[Allows value::AQ]] +* [[Allows value::AR]] +* [[Allows value::AS]] +* [[Allows value::AT]] +* [[Allows value::AU]] +* [[Allows value::AW]] +* [[Allows value::AX]] +* [[Allows value::AZ]] +* [[Allows value::BA]] +* [[Allows value::BB]] +* [[Allows value::BD]] +* [[Allows value::BE]] +* [[Allows value::BF]] +* [[Allows value::BG]] +* [[Allows value::BH]] +* [[Allows value::BI]] +* [[Allows value::BJ]] +* [[Allows value::BL]] +* [[Allows value::BM]] +* [[Allows value::BN]] +* [[Allows value::BO]] +* [[Allows value::BQ]] +* [[Allows value::BR]] +* [[Allows value::BS]] +* [[Allows value::BT]] +* [[Allows value::BW]] +* [[Allows value::BY]] +* [[Allows value::BZ]] +* [[Allows value::CA]] +* [[Allows value::CC]] +* [[Allows value::CD]] +* [[Allows value::CF]] +* [[Allows value::CG]] +* [[Allows value::CH]] +* [[Allows value::CI]] +* [[Allows value::CK]] +* [[Allows value::CL]] +* [[Allows value::CM]] +* [[Allows value::CN]] +* [[Allows value::CO]] +* [[Allows value::CR]] +* [[Allows value::CU]] +* [[Allows value::CV]] +* [[Allows value::CW]] +* [[Allows value::CX]] +* [[Allows value::CY]] +* [[Allows value::CZ]] +* [[Allows value::DE]] +* [[Allows value::DG]] +* [[Allows value::DJ]] +* [[Allows value::DK]] +* [[Allows value::DM]] +* [[Allows value::DO]] +* [[Allows value::DZ]] +* [[Allows value::EA]] +* [[Allows value::EC]] +* [[Allows value::EE]] +* [[Allows value::EG]] +* [[Allows value::EH]] +* [[Allows value::ER]] +* [[Allows value::ES]] +* [[Allows value::ET]] +* [[Allows value::EZ]] +* [[Allows value::FI]] +* [[Allows value::FJ]] +* [[Allows value::FK]] +* [[Allows value::FM]] +* [[Allows value::FO]] +* [[Allows value::FR]] +* [[Allows value::GA]] +* [[Allows value::GB]] +* [[Allows value::GD]] +* [[Allows value::GE]] +* [[Allows value::GF]] +* [[Allows value::GG]] +* [[Allows value::GH]] +* [[Allows value::GI]] +* [[Allows value::GL]] +* [[Allows value::GM]] +* [[Allows value::GN]] +* [[Allows value::GP]] +* [[Allows value::GQ]] +* [[Allows value::GR]] +* [[Allows value::GS]] +* [[Allows value::GT]] +* [[Allows value::GU]] +* [[Allows value::GW]] +* [[Allows value::GY]] +* [[Allows value::HK]] +* [[Allows value::HN]] +* [[Allows value::HR]] +* [[Allows value::HT]] +* [[Allows value::HU]] +* [[Allows value::IC]] +* [[Allows value::ID]] +* [[Allows value::IE]] +* [[Allows value::IL]] +* [[Allows value::IM]] +* [[Allows value::IN]] +* [[Allows value::IO]] +* [[Allows value::IQ]] +* [[Allows value::IR]] +* [[Allows value::IS]] +* [[Allows value::IT]] +* [[Allows value::JE]] +* [[Allows value::JM]] +* [[Allows value::JO]] +* [[Allows value::JP]] +* [[Allows value::KE]] +* [[Allows value::KG]] +* [[Allows value::KH]] +* [[Allows value::KI]] +* [[Allows value::KM]] +* [[Allows value::KN]] +* [[Allows value::KP]] +* [[Allows value::KR]] +* [[Allows value::KW]] +* [[Allows value::KY]] +* [[Allows value::KZ]] +* [[Allows value::LA]] +* [[Allows value::LB]] +* [[Allows value::LC]] +* [[Allows value::LI]] +* [[Allows value::LK]] +* [[Allows value::LR]] +* [[Allows value::LS]] +* [[Allows value::LT]] +* [[Allows value::LU]] +* [[Allows value::LV]] +* [[Allows value::LY]] +* [[Allows value::MA]] +* [[Allows value::MC]] +* [[Allows value::MD]] +* [[Allows value::ME]] +* [[Allows value::MF]] +* [[Allows value::MG]] +* [[Allows value::MH]] +* [[Allows value::MK]] +* [[Allows value::ML]] +* [[Allows value::MM]] +* [[Allows value::MN]] +* [[Allows value::MO]] +* [[Allows value::MP]] +* [[Allows value::MQ]] +* [[Allows value::MR]] +* [[Allows value::MS]] +* [[Allows value::MT]] +* [[Allows value::MU]] +* [[Allows value::MV]] +* [[Allows value::MW]] +* [[Allows value::MX]] +* [[Allows value::MY]] +* [[Allows value::MZ]] +* [[Allows value::NA]] +* [[Allows value::NC]] +* [[Allows value::NE]] +* [[Allows value::NF]] +* [[Allows value::NG]] +* [[Allows value::NI]] +* [[Allows value::NL]] +* [[Allows value::NO]] +* [[Allows value::NP]] +* [[Allows value::NR]] +* [[Allows value::NU]] +* [[Allows value::NZ]] +* [[Allows value::OM]] +* [[Allows value::PA]] +* [[Allows value::PE]] +* [[Allows value::PF]] +* [[Allows value::PG]] +* [[Allows value::PH]] +* [[Allows value::PK]] +* [[Allows value::PL]] +* [[Allows value::PM]] +* [[Allows value::PN]] +* [[Allows value::PR]] +* [[Allows value::PS]] +* [[Allows value::PT]] +* [[Allows value::PW]] +* [[Allows value::PY]] +* [[Allows value::QA]] +* [[Allows value::RE]] +* [[Allows value::RO]] +* [[Allows value::RV]] +* [[Allows value::RS]] +* [[Allows value::RU]] +* [[Allows value::RW]] +* [[Allows value::SA]] +* [[Allows value::SB]] +* [[Allows value::SC]] +* [[Allows value::SD]] +* [[Allows value::SE]] +* [[Allows value::SG]] +* [[Allows value::SH]] +* [[Allows value::SI]] +* [[Allows value::SJ]] +* [[Allows value::SK]] +* [[Allows value::SL]] +* [[Allows value::SM]] +* [[Allows value::SN]] +* [[Allows value::SO]] +* [[Allows value::SR]] +* [[Allows value::SS]] +* [[Allows value::ST]] +* [[Allows value::SV]] +* [[Allows value::SX]] +* [[Allows value::SY]] +* [[Allows value::SZ]] +* [[Allows value::TA]] +* [[Allows value::TC]] +* [[Allows value::TD]] +* [[Allows value::TF]] +* [[Allows value::TG]] +* [[Allows value::TH]] +* [[Allows value::TJ]] +* [[Allows value::TK]] +* [[Allows value::TL]] +* [[Allows value::TM]] +* [[Allows value::TN]] +* [[Allows value::TO]] +* [[Allows value::TR]] +* [[Allows value::TT]] +* [[Allows value::TV]] +* [[Allows value::TW]] +* [[Allows value::TZ]] +* [[Allows value::UA]] +* [[Allows value::UG]] +* [[Allows value::UM]] +* [[Allows value::UN]] +* [[Allows value::US]] +* [[Allows value::UY]] +* [[Allows value::UZ]] +* [[Allows value::VA]] +* [[Allows value::VC]] +* [[Allows value::VE]] +* [[Allows value::VG]] +* [[Allows value::VI]] +* [[Allows value::VN]] +* [[Allows value::VU]] +* [[Allows value::WF]] +* [[Allows value::WS]] +* [[Allows value::XK]] +* [[Allows value::YE]] +* [[Allows value::YT]] +* [[Allows value::ZA]] +* [[Allows value::ZM]] +* [[Allows value::ZW]] diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/date.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/date.mw new file mode 100644 index 00000000..9a4a194b --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/date.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Date]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/desc.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/desc.mw new file mode 100644 index 00000000..9c476939 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/desc.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Text]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/email.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/email.mw new file mode 100644 index 00000000..be13059f --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/email.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Email]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/geo.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/geo.mw new file mode 100644 index 00000000..fd999b3e --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/geo.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Geographic coordinates]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/lang.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/lang.mw new file mode 100644 index 00000000..2ff5dcb6 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/lang.mw @@ -0,0 +1,186 @@ +This is a property of type [[Has type::Text]]. + +* [[Allows value::aa]] +* [[Allows value::ab]] +* [[Allows value::ae]] +* [[Allows value::af]] +* [[Allows value::ak]] +* [[Allows value::am]] +* [[Allows value::an]] +* [[Allows value::ar]] +* [[Allows value::as]] +* [[Allows value::av]] +* [[Allows value::ay]] +* [[Allows value::az]] +* [[Allows value::ba]] +* [[Allows value::be]] +* [[Allows value::bg]] +* [[Allows value::bh]] +* [[Allows value::bi]] +* [[Allows value::bm]] +* [[Allows value::bn]] +* [[Allows value::bo]] +* [[Allows value::br]] +* [[Allows value::bs]] +* [[Allows value::ca]] +* [[Allows value::ce]] +* [[Allows value::ch]] +* [[Allows value::co]] +* [[Allows value::cr]] +* [[Allows value::cs]] +* [[Allows value::cu]] +* [[Allows value::cv]] +* [[Allows value::cy]] +* [[Allows value::da]] +* [[Allows value::de]] +* [[Allows value::dv]] +* [[Allows value::dz]] +* [[Allows value::ee]] +* [[Allows value::el]] +* [[Allows value::en]] +* [[Allows value::eo]] +* [[Allows value::es]] +* [[Allows value::et]] +* [[Allows value::eu]] +* [[Allows value::fa]] +* [[Allows value::ff]] +* [[Allows value::fi]] +* [[Allows value::fj]] +* [[Allows value::fo]] +* [[Allows value::fr]] +* [[Allows value::fy]] +* [[Allows value::ga]] +* [[Allows value::gd]] +* [[Allows value::gl]] +* [[Allows value::gn]] +* [[Allows value::gu]] +* [[Allows value::gv]] +* [[Allows value::ha]] +* [[Allows value::he]] +* [[Allows value::hi]] +* [[Allows value::ho]] +* [[Allows value::hr]] +* [[Allows value::ht]] +* [[Allows value::hu]] +* [[Allows value::hy]] +* [[Allows value::hz]] +* [[Allows value::ia]] +* [[Allows value::id]] +* [[Allows value::ie]] +* [[Allows value::ig]] +* [[Allows value::ii]] +* [[Allows value::ik]] +* [[Allows value::io]] +* [[Allows value::is]] +* [[Allows value::it]] +* [[Allows value::iu]] +* [[Allows value::ja]] +* [[Allows value::jv]] +* [[Allows value::ka]] +* [[Allows value::kg]] +* [[Allows value::ki]] +* [[Allows value::kj]] +* [[Allows value::kk]] +* [[Allows value::kl]] +* [[Allows value::km]] +* [[Allows value::kn]] +* [[Allows value::ko]] +* [[Allows value::kr]] +* [[Allows value::ks]] +* [[Allows value::ku]] +* [[Allows value::kv]] +* [[Allows value::kw]] +* [[Allows value::ky]] +* [[Allows value::la]] +* [[Allows value::lb]] +* [[Allows value::lg]] +* [[Allows value::li]] +* [[Allows value::ln]] +* [[Allows value::lo]] +* [[Allows value::lt]] +* [[Allows value::lu]] +* [[Allows value::lv]] +* [[Allows value::mg]] +* [[Allows value::mh]] +* [[Allows value::mi]] +* [[Allows value::mk]] +* [[Allows value::ml]] +* [[Allows value::mn]] +* [[Allows value::mr]] +* [[Allows value::ms]] +* [[Allows value::mt]] +* [[Allows value::my]] +* [[Allows value::na]] +* [[Allows value::nb]] +* [[Allows value::nd]] +* [[Allows value::ne]] +* [[Allows value::ng]] +* [[Allows value::nl]] +* [[Allows value::nn]] +* [[Allows value::no]] +* [[Allows value::nr]] +* [[Allows value::nv]] +* [[Allows value::ny]] +* [[Allows value::oc]] +* [[Allows value::oj]] +* [[Allows value::om]] +* [[Allows value::or]] +* [[Allows value::os]] +* [[Allows value::pa]] +* [[Allows value::pi]] +* [[Allows value::pl]] +* [[Allows value::ps]] +* [[Allows value::pt]] +* [[Allows value::qu]] +* [[Allows value::rm]] +* [[Allows value::rn]] +* [[Allows value::ro]] +* [[Allows value::ru]] +* [[Allows value::rw]] +* [[Allows value::sa]] +* [[Allows value::sc]] +* [[Allows value::sd]] +* [[Allows value::se]] +* [[Allows value::sg]] +* [[Allows value::si]] +* [[Allows value::sk]] +* [[Allows value::sl]] +* [[Allows value::sm]] +* [[Allows value::sn]] +* [[Allows value::so]] +* [[Allows value::sq]] +* [[Allows value::sr]] +* [[Allows value::ss]] +* [[Allows value::st]] +* [[Allows value::su]] +* [[Allows value::sv]] +* [[Allows value::sw]] +* [[Allows value::ta]] +* [[Allows value::te]] +* [[Allows value::tg]] +* [[Allows value::th]] +* [[Allows value::ti]] +* [[Allows value::tk]] +* [[Allows value::tl]] +* [[Allows value::tn]] +* [[Allows value::to]] +* [[Allows value::tr]] +* [[Allows value::ts]] +* [[Allows value::tt]] +* [[Allows value::tw]] +* [[Allows value::ty]] +* [[Allows value::ug]] +* [[Allows value::uk]] +* [[Allows value::ur]] +* [[Allows value::uz]] +* [[Allows value::ve]] +* [[Allows value::vi]] +* [[Allows value::vo]] +* [[Allows value::wa]] +* [[Allows value::wo]] +* [[Allows value::xh]] +* [[Allows value::yi]] +* [[Allows value::yo]] +* [[Allows value::za]] +* [[Allows value::zh]] +* [[Allows value::zu]] diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/number.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/number.mw new file mode 100644 index 00000000..cac533c1 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/number.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Integer]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/phone.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/phone.mw new file mode 100644 index 00000000..f15f432c --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/phone.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Telephone number]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/text.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/text.mw new file mode 100644 index 00000000..9c476939 --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/text.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::Text]]. diff --git a/bin/reevotech/CreateSemanticObject/tpl/Property/url.mw b/bin/reevotech/CreateSemanticObject/tpl/Property/url.mw new file mode 100644 index 00000000..9d5a8fcd --- /dev/null +++ b/bin/reevotech/CreateSemanticObject/tpl/Property/url.mw @@ -0,0 +1 @@ +This is a property of type [[Has type::URL]]. diff --git a/bin/reevotech/PullPages.sh b/bin/reevotech/PullPages.sh index e479e39e..29071c24 100755 --- a/bin/reevotech/PullPages.sh +++ b/bin/reevotech/PullPages.sh @@ -10,25 +10,48 @@ fi cd /srv/reevotech DEPLOY=$1 -DEPLOYFILE=`ls ./etc | grep $DEPLOY` -NS=$2 +DEPLOYFILE=`ls ./etc | grep $DEPLOY | grep -v '.test' | grep -v '.old'` DOMAIN=`cat ./etc/$DEPLOYFILE | grep 'REEVO_URL =' | cut -d'"' -f 2` + # echo $DEPLOY # echo $DEPLOYFILE # echo $DOMAIN cd ./www/wiki/deployments/$DEPLOY -if [[ -d pages_tmp/$NS ]] +update_ns () { + if [[ -d pages_tmp/$1 ]] + then + echo "" + cd pages_tmp/$1 + git pull + cd ../../ + else + git clone -c remote.origin.namespaces="$1" mediawiki::http://$DOMAIN pages_tmp/$1 + fi + + cp -rf pages_tmp/$1 pages + rm -rf pages/$1/.git +} + +NS=$2 + +if [ -z "$2" ] then + echo "This script download the wikipages in the DB to text files..." + echo "I am going to process all the active NameSpaces for the specified deployment:" + ls pages echo "" - cd pages_tmp/$NS - git pull - cd ../../ + echo "Enter to continue..." + read + for i in `ls pages` + do + update_ns $i + done + else - git clone -c remote.origin.namespaces="$NS" mediawiki::http://$DOMAIN pages_tmp/$NS + echo "This script download the wikipages in the DB to text files..." + echo "I am going to process only the specificed NameSpace: $NS" + update_ns $NS fi - -cp -rf pages_tmp/$NS pages -rm -rf pages/$NS/.git diff --git a/bin/reevotech/PutPages.sh b/bin/reevotech/PutPages.sh index 831a8616..abf6065e 100755 --- a/bin/reevotech/PutPages.sh +++ b/bin/reevotech/PutPages.sh @@ -7,13 +7,34 @@ if [ $# -eq 0 ] exit fi +DEPLOY=$1 +cd /srv/reevotech/www/wiki/maintenance/ -cd /srv/reevotech +update_ns () { + echo "" + echo "########### Updating pages in $1" + php importTextFiles.php --conf ../LocalSettings-$DEPLOY.php -s "Updated using PutPages.sh" --overwrite "../deployments/$DEPLOY/pages/$1/*" + echo "" +} -DEPLOY=$1 NS=$2 +if [ -z "$2" ] +then + echo "This script replaces the wikipages from the text files to the DB..." + echo "I am going to update pages in all the active NameSpaces for the specified deployment:" + ls ../deployments/$DEPLOY/pages/ + echo "" + # echo "Enter to continue..." + read + for i in `ls ../deployments/$DEPLOY/pages/` + do + update_ns $i + done -cd /srv/reevotech/www/wiki/maintenance/ - +else + echo "This script replaces the wikipages from the text files to the DB..." + echo "I am going to process only the specificed NameSpace: $NS" + update_ns $NS +fi -php importTextFiles.php --conf ../LocalSettings-$DEPLOY.php -s "Updated using PutPages.sh" --overwrite "../deployments/$DEPLOY/pages/$NS/*" +/usr/bin/php runJobs.php --conf /srv/reevotech/www/wiki/LocalSettings-$DEPLOY.php diff --git a/bin/sync/sync-wiki.sh b/bin/sync/sync-wiki.sh index 1be3cd68..bb6de2ba 100755 --- a/bin/sync/sync-wiki.sh +++ b/bin/sync/sync-wiki.sh @@ -15,7 +15,7 @@ then fi DEPLOY=$1 -DEPLOYFILE=`ls ./etc | grep $DEPLOY` +DEPLOYFILE=`ls ./etc | grep $DEPLOY | grep -v '.test' | grep -v '.old'` echo $DEPLOY @@ -72,6 +72,12 @@ mysql --user=$USER --password=$PASSWORD $DB < "/tmp/$REMOTO-$DB.sql" echo "" echo "" echo "###################" +echo "Actualizo el repositorio de páginas propio del deployment $DEPLOY" +../reevotech/PullPages.sh $DEPLOY + +echo "" +echo "" +echo "###################" echo "Vamos a sincronizar algunos directorios con archivos desde $REMOTO a este servidor" sleep 2s diff --git a/etc/global_config.php.sample b/etc/global_config.php.sample index c189249f..e4627144 100755 --- a/etc/global_config.php.sample +++ b/etc/global_config.php.sample @@ -10,7 +10,7 @@ $REEVO_PATH = "/srv/reevotech"; $REEVO_URL = "reevo.test"; $REEVO_CODENAME = "reevo"; - +$REEVO_URL_PRODUCTION = "reevo.org"; $REEVO_PROTOCOL = "http"; $REEVO_DB_USER = ""; diff --git a/i18n/wiki/iso/en.json b/i18n/wiki/iso/en.json index c710baa1..315aaa44 100644 --- a/i18n/wiki/iso/en.json +++ b/i18n/wiki/iso/en.json @@ -183,6 +183,7 @@ "rv-country-RO": "Romania", "rv-country-RU": "Russian Federation", "rv-country-RW": "Rwanda", + "rv-country-RV": "Rojava", "rv-country-BL": "Saint Barthélemy", "rv-country-SH": "Saint Helena, Ascension and Tristan da Cunha", "rv-country-KN": "Saint Kitts and Nevis", diff --git a/www/wiki/extensions/ConfirmEdit/QuestyCaptcha/i18n/en.json b/www/wiki/extensions/ConfirmEdit/QuestyCaptcha/i18n/en.json index 551dc056..8f147470 100644 --- a/www/wiki/extensions/ConfirmEdit/QuestyCaptcha/i18n/en.json +++ b/www/wiki/extensions/ConfirmEdit/QuestyCaptcha/i18n/en.json @@ -3,11 +3,11 @@ "authors": [] }, "questycaptcha-desc": "Questy CAPTCHA generator for Confirm Edit", - "questycaptcha-addurl": "Your edit includes new external links.\nTo protect the wiki against automated edit spam, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", - "questycaptcha-badlogin": "To protect the wiki against automated password cracking, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", - "questycaptcha-createaccount": "To protect the wiki against automated account creation, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", + "questycaptcha-addurl": "Your edit includes new external links.\nTo protect the platform against automated edit spam, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", + "questycaptcha-badlogin": "To protect the platform against automated password cracking, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", + "questycaptcha-createaccount": "To protect the platform against automated account creation, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", "questycaptcha-create": "To create the page, please answer the question that appears below ([[Special:Captcha/help|more info]]):", "questycaptcha-edit": "To edit this page, please answer the question that appears below ([[Special:Captcha/help|more info]]):", - "questycaptcha-sendemail": "To protect the wiki against automated spamming, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", - "questycaptchahelp-text": "Web sites that accept contributions from the public, like this wiki, are often abused by spammers who use automated tools to add their links to many sites.\nWhile these spam links can be removed, they are a significant nuisance.\n\nSometimes, especially when adding new web links to a page, the wiki may ask you to answer a question.\nSince this is a task that is hard to automate, it will allow most real humans to make their contributions while stopping most spammers and other robotic attackers.\n\nPlease contact the [[Special:ListAdmins|site administrators]] for assistance if this is unexpectedly preventing you from making legitimate contributions.\n\nClick the \"back\" button in your browser to return to the page editor." -}
\ No newline at end of file + "questycaptcha-sendemail": "To protect the platform against automated spamming, we kindly ask you to answer the question that appears below ([[Special:Captcha/help|more info]]):", + "questycaptchahelp-text": "Web sites that accept contributions from the public, like this platform, are often abused by spammers who use automated tools to add their links to many sites.\nWhile these spam links can be removed, they are a significant nuisance.\n\nSometimes, especially when adding new web links to a page, the platform may ask you to answer a question.\nSince this is a task that is hard to automate, it will allow most real humans to make their contributions while stopping most spammers and other robotic attackers.\n\nPlease contact the [[Special:ListAdmins|site administrators]] for assistance if this is unexpectedly preventing you from making legitimate contributions.\n\nClick the \"back\" button in your browser to return to the page editor." +} diff --git a/www/wiki/extensions/ConfirmEdit/i18n/en.json b/www/wiki/extensions/ConfirmEdit/i18n/en.json index c932228d..e7a62566 100644 --- a/www/wiki/extensions/ConfirmEdit/i18n/en.json +++ b/www/wiki/extensions/ConfirmEdit/i18n/en.json @@ -11,7 +11,7 @@ "captcha-id-label": "CAPTCHA ID", "captcha-id-help": "This value should be sent back unchanged.", "captcha-ip-whitelist": "-", - "captcha-addurl": "Your edit includes new external links.\nTo protect the wiki against automated spam, we kindly ask you to solve the following task below and enter the answer in the box in order to save your edit ([[Special:Captcha/help|more info]]):", + "captcha-addurl": "Your edit includes new external links.\nTo protect the platform against automated spam, we kindly ask you to solve the following task below and enter the answer in the box in order to save your edit ([[Special:Captcha/help|more info]]):", "captcha-badlogin": "To protect the platform against automated password cracking, we kindly ask you to solve the following task below and enter the answer in the box ([[Special:Captcha/help|more info]]):", "captcha-createaccount": "To protect the platform against automated account creation, we kindly ask you to solve the following task below and enter the answer in the box:", "captcha-createaccount-fail": "Incorrect or missing CAPTCHA.", diff --git a/www/wiki/extensions/CountryStates/countries-states.json b/www/wiki/extensions/CountryStates/countries-states.json index 82cc27b7..c1126194 100644 --- a/www/wiki/extensions/CountryStates/countries-states.json +++ b/www/wiki/extensions/CountryStates/countries-states.json @@ -11933,6 +11933,40 @@ "name": "Reunion" }, { + "code": "RV", + "name": "Rojava", + "states": [ + { + "code": "01", + "name": "Afrin" + }, + { + "code": "02", + "name": "Jazira" + }, + { + "code": "03", + "name": "Euphrates" + }, + { + "code": "04", + "name": "Raqqa" + }, + { + "code": "05", + "name": "Tabqa" + }, + { + "code": "06", + "name": "Manbij" + }, + { + "code": "07", + "name": "Deir Ez-Zor" + } + ] + }, + { "code": "RO", "name": "Romania", "states": [ diff --git a/www/wiki/images b/www/wiki/images deleted file mode 120000 index f4104147..00000000 --- a/www/wiki/images +++ /dev/null @@ -1 +0,0 @@ -../../files/wiki/
\ No newline at end of file diff --git a/www/wiki/skins/bo/reevo.less b/www/wiki/skins/bo/reevo.less index a5fd8b2f..0e1fa2e8 100644 --- a/www/wiki/skins/bo/reevo.less +++ b/www/wiki/skins/bo/reevo.less @@ -494,3 +494,7 @@ ul.visible-xs.pull-right.navbar-xs.navbar-tools.navbar-nav { width: 280px; } } + +.radioButtonSpan { + height: auto !important; +} |