Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Project can share a url to a signature platform #234

Merged
merged 5 commits into from Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions Resources/templates/responsive/project/partials/main_extra.php
Expand Up @@ -254,6 +254,16 @@

<?php endif; ?>

<?php if ($project->sign_url): ?>

<div class="col-sm-4 hidden-sm hidden-xs sign" style="<?= !$project->called ? 'margin-top: 55px;' : '' ?>">
<a href="<?= $project->sign_url ?>" target="_blank" class="btn btn-sign col-sm-10 text-uppercase">
<?= $project->sign_url_action ?>
</a>
</div>

<?php endif; ?>

<?php if ($project->node !== $this->get_config('current_node')&&($project->nodeData->active)) : ?>

<div class="col-sm-4 hidden-sm hidden-xs channel" style="<?= !$project->called ? 'margin-top: 55px;' : '' ?>">
Expand Down
Expand Up @@ -190,7 +190,6 @@
<div class="progress-bar <?= $progress==100 ? 'progress-completed' : '' ?>" role="progressbar" aria-valuenow="<?= $progress ?>" aria-valuemin="0" aria-valuemax="100" style="width:<?= $progress ?>%">
</div>
</div>
<div class="matcher-amount">

<?php if($progress==100): ?>

Expand All @@ -215,16 +214,24 @@

<?php endif; ?>

</div>
</div>
</div>
</div>

</div>

<?php endforeach; ?>
<?php endforeach; ?>

</div>

<?php endif; ?>

<?php if ($project->sign_url): ?>

<div class="visible-xs sign" >
<a href="<?= $project->sign_url ?>" target="_blank" class="btn btn-block btn-sign col-sm-10 text-uppercase">
<?= $project->sign_url_action ?>
</a>
</div>

<?php endif; ?>


Expand Down
3 changes: 3 additions & 0 deletions Resources/translations/ca/overview.yml
Expand Up @@ -81,3 +81,6 @@ overview-field-sustainability-model: 'Model de sostenibilitat'
overview-field-sustainability-model-url: 'URL del teu business canvas'
tooltip-project-sustainability-model: 'Explica el model de sostenibilitat del teu projecte'
tooltip-project-sustainability-model-url: 'Afegeix una url amb teu <a href="https://canvanizer.com/new/business-model-canvas" target="_blank">business canvas</a>'
overview-field-sign-url: "Url per signar"
overview-field-sign-url-action: "Text per fer una crida a signar"
overview-field-sign-url-help: "Aquest camp et permet afegir un salt cap a la teva pàgina de recollida de signatures"
3 changes: 3 additions & 0 deletions Resources/translations/en/overview.yml
Expand Up @@ -78,3 +78,6 @@ overview-field-sustainability-model: 'Sustainability plan'
overview-field-sustainability-model-url: 'URL of your business canvas'
tooltip-project-sustainability-model: 'Present a basic business plan to show how you will ensure project''s sustainability. The business plan should cover the key elements of the business canvas template and be no longer than two pages.'
tooltip-project-sustainability-model-url: 'Add the URL of your <a href="https://canvanizer.com/new/business-model-canvas" target="_blank">business canvas</a>'
overview-field-sign-url: "Singature Url"
overview-field-sign-url-action: "Text to call for signature"
overview-field-sign-url-help: "This field allows you to add a redirection to your project signature page"
5 changes: 4 additions & 1 deletion Resources/translations/es/overview.yml
Expand Up @@ -83,4 +83,7 @@ overview-field-sustainability-model-url: 'URL de tu business canva'
tooltip-project-sustainability-model: 'Explica el modelo de sostenibilidad de tu proyecto'
tooltip-project-sustainability-model-url: 'Agrega una url con tu <a href="https://canvanizer.com/new/business-model-canvas" target="_blank">business canvas</a>'
tooltip-project-sdg: 'Elige los objetivos con los que cumple tu proyecto, intentando seleccionar un máximo de tres.'
tooltip-project-sdg-suggestion: 'A continuación te sugerimos algunos ODS que podrían encajar según el compromiso social seleccionado para tu proyecto, te recomendamos que consultes <a href="https://www.un.org/sustainabledevelopment/es/objetivos-de-desarrollo-sostenible/" target="_blank">aquí</a> su contenido especifico.<br><br>'
tooltip-project-sdg-suggestion: 'A continuación te sugerimos algunos ODS que podrían encajar según el compromiso social seleccionado para tu proyecto, te recomendamos que consultes <a href="https://www.un.org/sustainabledevelopment/es/objetivos-de-desarrollo-sostenible/" target="_blank">aquí</a> su contenido especifico.<br><br>'
overview-field-sign-url: "Url de firma"
overview-field-sign-url-action: "Texto para llamar a firmar"
overview-field-sign-url-help: "Este campo permite añadir un salto en la campaña para tu página de firmas del proyecto"
57 changes: 57 additions & 0 deletions db/migrations/20210915125443_goteo_project_sign_url.php
@@ -0,0 +1,57 @@
<?php
/**
* Migration Task class.
*/
class GoteoProjectSignUrl
{
public function preUp()
{
// add the pre-migration code here
}

public function postUp()
{
// add the post-migration code here
}

public function preDown()
{
// add the pre-migration code here
}

public function postDown()
{
// add the post-migration code here
}

/**
* Return the SQL statements for the Up migration
*
* @return string The SQL string to execute for the Up migration.
*/
public function getUpSQL()
{
return "
ALTER TABLE `project` ADD COLUMN `sign_url` VARCHAR(255) DEFAULT NULL;
ALTER TABLE `project_lang` ADD COLUMN `sign_url` VARCHAR(255) DEFAULT NULL;
ALTER TABLE `project` ADD COLUMN `sign_url_action` VARCHAR(255) DEFAULT NULL;
ALTER TABLE `project_lang` ADD COLUMN `sign_url_action` VARCHAR(255) DEFAULT NULL;
";
}

/**
* Return the SQL statements for the Down migration
*
* @return string The SQL string to execute for the Down migration.
*/
public function getDownSQL()
{
return "
ALTER TABLE `project` DROP COLUMN `sign_url`;
ALTER TABLE `project_lang` DROP COLUMN `sign_url`;
ALTER TABLE `project` DROP COLUMN `sign_url_action`;
ALTER TABLE `project_lang` DROP COLUMN `sign_url_action`;
";
}

}
11 changes: 7 additions & 4 deletions public/assets/sass/components/_buttons.scss
Expand Up @@ -123,14 +123,17 @@
color: $color-white;
}
}

.btn-sign {
background-color: $background-light-red;
background-color: $background-dark-red;
color: $color-white;
&:hover {
background-color:$background-dark-red;
color: $color-white;
padding: 15px 1px;
border-radius: 10px;
&:hover, &:focus {
color: $color-white !important;
}
}

.btn-fashion {
background: $color-pink;
@include background(linear-gradient(to right, $color-pink 28%,$color-red 100%));
Expand Down
3 changes: 3 additions & 0 deletions public/assets/sass/project.scss
Expand Up @@ -1342,6 +1342,9 @@ div {
margin-left: 0;
}
}
&.sign{
margin-bottom: 25px;
}

}
/* Investors section */
Expand Down
16 changes: 16 additions & 0 deletions src/Goteo/Library/Forms/Model/ProjectOverviewForm.php
Expand Up @@ -24,6 +24,9 @@
use Goteo\Model\Project\ProjectLocation;
use Goteo\Model\Sdg;

use Goteo\Util\Form\Type\TextType;
use Goteo\Util\Form\Type\UrlType;


class ProjectOverviewForm extends AbstractFormProcessor implements FormProcessorInterface {

Expand Down Expand Up @@ -253,6 +256,19 @@ public function createForm() {
'required' => false,
'attr' => ['help' => Text::get('tooltip-project-social-description'), 'rows' => 8]
])

->add('sign_url', UrlType::Class, [
'label' => 'overview-field-sign-url',
'required' => false,
'attr' => [
'pre-help' => Text::get('overview-field-sign-url-help')
]
])

->add('sign_url_action', TextType::class, [
'label' => 'overview-field-sign-url-action',
'required' => false
])
;

return $this;
Expand Down
13 changes: 13 additions & 0 deletions src/Goteo/Library/Forms/Model/ProjectTranslateOverviewForm.php
Expand Up @@ -19,6 +19,9 @@
use Goteo\Library\Text;
use Goteo\Library\Forms\FormModelException;

use Goteo\Util\Form\Type\TextType;
use Goteo\Util\Form\Type\UrlType;

class ProjectTranslateOverviewForm extends AbstractFormProcessor implements FormProcessorInterface {

public function createForm() {
Expand Down Expand Up @@ -97,6 +100,16 @@ public function createForm() {
'required' => false,
'attr' => ['help' => $project->social_commitment_description, 'rows' => 8]
])
->add('sign_url', UrlType::Class, [
'label' => 'overview-field-sign-url',
'attr' => [
'pre-help' => Text::get('overview-field-sign-url-help')
]
])

->add('sign_url_action', TextType::class, [
'label' => 'overview-field-sign-url-action'
])
;
return $this;
}
Expand Down
11 changes: 8 additions & 3 deletions src/Goteo/Model/Project.php
Expand Up @@ -181,8 +181,11 @@ class Project extends \Goteo\Core\Model {
$one_round = 0,
$help_cost = 0,
$help_license= 0,
$callInstance = null // si está en una convocatoria
$callInstance = null, // si está en una convocatoria

// Data about political participation outside Goteo
$sign_url = '',
$sign_url_action = ''

;

Expand Down Expand Up @@ -1711,7 +1714,9 @@ public function save (&$errors = array()) {
'analytics_id',
'facebook_pixel',
'social_commitment',
'social_commitment_description'
'social_commitment_description',
'sign_url',
'sign_url_action'
);

try {
Expand Down Expand Up @@ -1890,7 +1895,7 @@ public function save (&$errors = array()) {
}

public static function getLangFields() {
return ['name', 'subtitle', 'description', 'motivation', 'video', 'about', 'goal', 'related', 'reward', 'keywords', 'media', 'social_commitment_description'];
return ['name', 'subtitle', 'description', 'motivation', 'video', 'about', 'goal', 'related', 'reward', 'keywords', 'media', 'social_commitment_description', 'sign_url', 'sign_url_action'];
}

/*
Expand Down