Skip to content

Commit bb16bce

Browse files
paugnupaugnu
committed
Merge pull request #151 from Softcatala/elements_barra_lateral
Perfecte. Això és tot. #merged
2 parents 1c4b0c3 + 0448cdf commit bb16bce

33 files changed

+235
-364
lines changed

‎archive-programa.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @package wp-softcatala
88
*/
99
//JS and Styles related to the page
10+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
1011
wp_enqueue_script( 'sc-js-programes', get_template_directory_uri() . '/static/js/programes.js', array('sc-js-main'), '1.0.0', true );
1112
wp_localize_script( 'sc-js-programes', 'scajax', array(
1213
'ajax_url' => admin_url( 'admin-ajax.php' )
@@ -24,13 +25,15 @@
2425
$context['conditions_text'] = "Si voleu afegir un programa nou...";
2526
$context['sidebar_top'] = Timber::get_widgets('sidebar_top');
2627
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom');
27-
$context['sidebar_elements'] = array( 'static/suggeriment.twig', 'baixades.twig', 'links.twig' );
28+
$context['sidebar_elements'] = array( 'static/ajudeu.twig', 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
2829

2930
//Filters population
3031
$context['categories']['sistemes_operatius'] = Timber::get_terms( 'sistema-operatiu-programa' );
3132
$context['categories']['categories_programes'] = Timber::get_terms( 'categoria-programa' );
3233
$context['categories']['llicencies'] = Timber::get_terms('llicencia');
3334

35+
//Contact Form
36+
$context['contact']['to_email'] = get_option('email_rebost');
3437

3538
//Search and filters
3639
$search = get_query_var('cerca');

‎archive-projecte.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @package wp-softcatala
88
*/
99
//JS and Styles related to the page
10-
10+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
1111

1212
//Template initialization
1313
$templates = array( 'archive-projecte.twig' );
@@ -20,7 +20,12 @@
2020
$context['post_type'] = $post_type;
2121
$context['sidebar_top'] = Timber::get_widgets('sidebar_top');
2222
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom');
23-
$context['sidebar_elements'] = array( 'static/suggeriment.twig', 'baixades.twig', 'links.twig' );
23+
$context['sidebar_elements'] = array( 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
24+
25+
//Contact Form Data
26+
$context['contact']['to_email'] = 'web@softcatala.org';
27+
$context['contact']['nom_from'] = 'Projectes de Softcatalà';
28+
$context['contact']['assumpte'] = '[Projectes] Contacte des del formulari';
2429

2530
//Posts and pagination
2631
$context['posts'] = Timber::get_posts();

‎corrector.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
/* JS scripts */
9+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
910
wp_enqueue_script( 'sc-js-corrector-1', get_template_directory_uri() . '/inc/languagetool/online-check/tiny_mce/tiny_mce.js', array(), '1.0.0', true );
1011
wp_enqueue_script( 'sc-js-corrector-2', get_template_directory_uri() . '/inc/languagetool/online-check/tiny_mce/plugins/atd-tinymce/editor_plugin.js', array(), '1.0.0', true );
1112
wp_enqueue_script( 'sc-js-corrector-3', get_template_directory_uri() . '/inc/languagetool/js/ZeroClipboard.js', array(), '1.0.0', true );
@@ -25,4 +26,8 @@
2526
$context['sidebar_top'] = Timber::get_widgets('sidebar_top_recursos');
2627
$context['sidebar_elements'] = array( 'static/ajudeu.twig', 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
2728
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom_recursos');
29+
30+
//Contact Form
31+
$context['contact']['to_email'] = get_option('email_recursos');
32+
2833
Timber::render( array( 'corrector.twig' ), $context );

‎diccionari-multilingue.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
/* JS scripts */
9+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
910
wp_enqueue_script( 'sc-js-typeahead', get_template_directory_uri() . '/static/js/typeahead.js', array('sc-js-main'), '1.0.0', true );
1011
wp_enqueue_script( 'sc-js-multilingue', get_template_directory_uri() . '/static/js/multilingue.js', array('sc-js-typeahead'), '1.0.0', true );
1112
wp_localize_script( 'sc-js-multilingue', 'scajax', array(
@@ -81,4 +82,8 @@
8182
$context['sidebar_top'] = Timber::get_widgets('sidebar_top_recursos');
8283
$context['sidebar_elements'] = array( 'static/ajudeu.twig', 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
8384
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom_recursos');
85+
86+
//Contact Form
87+
$context['contact']['to_email'] = get_option('email_recursos');
88+
8489
Timber::render( array( 'diccionari-multilingue.twig' ), $context );

‎functions.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,29 @@ function include_sc_settings() {
115115
register_setting( 'softcatala-group', 'api_diccionari_multilingue' );
116116
register_setting( 'softcatala-group', 'api_diccionari_sinonims' );
117117

118+
//Email contact parameters
119+
$sections = $this->get_email_sections();
120+
foreach ( $sections as $key => $section ) {
121+
register_setting( 'softcatala-group', 'email_'.$key );
122+
}
123+
118124
if ( function_exists('add_submenu_page') )
119125
add_submenu_page('options-general.php', 'Softcatalà Settings', 'Softcatalà Settings', 'manage_options', __FILE__, array ( $this, 'softcatala_dash_page' ));
120126
}
121127

128+
function get_email_sections() {
129+
$sections = array( 'general' => 'General', 'traductor' => 'Traductor', 'recursos' => 'Recursos', 'rebost' => 'Programes' );
130+
return $sections;
131+
}
132+
122133
/**
123134
* Renders the Softcatalà dashboard settings page
124135
*/
125136
function softcatala_dash_page() {
137+
wp_enqueue_script( 'sc-js-dash', get_template_directory_uri() . '/static/js/sc-admin.js', array('jquery'), '1.0.0', true );
126138
$admin_template = dirname(__FILE__) . '/templates/admin/sc-dash.twig';
127-
$section_html_content = Timber::fetch( $admin_template );
139+
$sections = $this->get_email_sections();
140+
$section_html_content = Timber::fetch( $admin_template, array ('sections' => $sections ));
128141
echo $section_html_content;
129142
}
130143

‎inc/ajax_operations.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ function sc_contact_form() {
231231
}
232232
}
233233

234-
die($output);
234+
echo $output;
235+
die();
235236
}
236237

237238
/**

‎plantilla-steps.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
$context['content_title'] = $content_title;
5454
$context['links'] = $post->get_field( 'link' );
5555
$context['sidebar_top'] = Timber::get_widgets('sidebar_top');
56-
$context['sidebar_elements'] = array( 'static/ajudeu.twig', 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
56+
$context['sidebar_elements'] = array( 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
5757
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom');
5858
Timber::render( $templates, $context );

‎single-programa.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* @package wp-softcatala
88
*/
9-
9+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
1010
wp_enqueue_script( 'sc-js-programes', get_template_directory_uri() . '/static/js/programes.js', array('sc-js-main'), '1.0.0', true );
1111
wp_localize_script( 'sc-js-programes', 'scajax', array(
1212
'ajax_url' => admin_url( 'admin-ajax.php' )
@@ -23,11 +23,19 @@
2323
$context['links'] = $post->get_field( 'link' );
2424
$baixades = $post->get_field( 'baixada' );
2525

26+
//Contact Form
27+
$context['contact']['to_email'] = get_option('email_rebost');
28+
29+
30+
//Add program form data
31+
$context['categories']['sistemes_operatius'] = Timber::get_terms( 'sistema-operatiu-programa' );
32+
$context['categories']['categories_programes'] = Timber::get_terms( 'categoria-programa' );
33+
$context['categories']['llicencies'] = Timber::get_terms('llicencia');
34+
2635
//Download count
2736
$download_full = json_decode(file_get_contents(ABSPATH.'../full.json'), true);
2837
$index = array_search($post->idrebost, array_column($download_full, 'idrebost'));
2938
$context['total_downloads'] = $download_full[$index]['total'];
30-
3139
$context['baixades'] = generate_url_download( $baixades, $post );
3240

3341
$context['credits'] = $post->get_field( 'credit' );

‎single-projecte.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
$post_links = types_child_posts('link', $post->ID);
1616
$context['links'] = $post->get_field( 'link' );
1717

18+
//Contact Form Data
19+
$context['contact']['to_email'] = 'web@softcatala.org';
20+
$context['contact']['nom_from'] = 'Projectes de Softcatalà';
21+
$context['contact']['assumpte'] = '[Projectes] Contacte des del formulari';
22+
1823
//Related subpages
1924
$query = array ( 'post_id' => $post->ID, 'subpage_type' => 'projecte' );
2025
$args = get_post_query_args( 'page', SearchQueryType::PagePrograma, $query );

‎sinonims.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
/* JS scripts */
9+
wp_enqueue_script( 'sc-js-contacte', get_template_directory_uri() . '/static/js/contact_form.js', array('sc-js-main'), '1.0.0', true );
910
wp_enqueue_script( 'sc-js-sinonims', get_template_directory_uri() . '/static/js/sinonims.js', array(), '1.0.0', true );
1011
wp_localize_script( 'sc-js-sinonims', 'scajax', array(
1112
'ajax_url' => admin_url( 'admin-ajax.php' )
@@ -39,4 +40,8 @@
3940
$context['sidebar_top'] = Timber::get_widgets('sidebar_top_recursos');
4041
$context['sidebar_elements'] = array( 'static/ajudeu.twig', 'static/dubte_forum.twig', 'baixades.twig', 'links.twig' );
4142
$context['sidebar_bottom'] = Timber::get_widgets('sidebar_bottom_recursos');
43+
44+
//Contact Form
45+
$context['contact']['to_email'] = get_option('email_recursos');
46+
4247
Timber::render( array( 'sinonims.twig' ), $context );

‎static/js/contact_form.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
/** Contact form action **/
2+
var $contactForm = jQuery('#report_form');
3+
4+
$contactForm.on('submit', function(ev){
5+
ev.preventDefault();
6+
7+
//Data
8+
var post_data = new FormData();
9+
post_data.append('nom', jQuery('input[name=nom_contacte]').val());
10+
post_data.append('correu', jQuery('input[name=correu_contacte]').val());
11+
post_data.append('tipus', jQuery('#tipus_contacte option:selected').val());
12+
post_data.append('comentari', jQuery('#comentari_contacte').val());
13+
post_data.append('to_email', jQuery('#to_email').val());
14+
post_data.append('nom_from', jQuery('#nom_from').val());
15+
post_data.append('assumpte', jQuery('#assumpte').val());
16+
post_data.append('action', 'contact_form');
17+
post_data.append('_wpnonce', jQuery('input[name=_wpnonce]').val());
18+
19+
jQuery.ajax({
20+
type: 'POST',
21+
url: scajax.ajax_url,
22+
data: post_data,
23+
dataType: 'json',
24+
contentType: false,
25+
processData: false,
26+
success : contact_form_ok,
27+
error : contact_form_ko
28+
});
29+
});
30+
31+
function contact_form_ok(dt) {
32+
if (dt.type == 'message') {
33+
jQuery("#contingut-formulari").hide();
34+
jQuery("#contingut-formulari-response").empty().html(dt.text).fadeIn();
35+
}
36+
}
37+
38+
function contact_form_ko() {
39+
var message = 'Alguna cosa no ha funcionat bé en enviar les dades al servidor de traducció';
40+
jQuery("#contingut-formulari").hide();
41+
jQuery("#contingut-formulari-response").empty().html(message).fadeIn();
42+
}
43+
44+
jQuery('#contact_form').click(function() {
45+
jQuery("#contingut-formulari-response").hide();
46+
jQuery("textarea[name='comentari']").val('');
47+
jQuery("#contingut-formulari").show();
48+
});
49+
/** End contact form action **/

‎static/js/languagetool.js

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -234,53 +234,4 @@ function insertDemoText()
234234
{
235235
var myDemoText="Aquests frases servixen per a probar algun de les errades que detecta el corrector gramaticals. Proveu les variants de flexió verbal: penso, pense, pens. L'accentuació valenciana o general: café o cafè. Paraules errònies segons el context: Et menjaràs tots els canalons? Li va infringir un càstig sever. Errors de sintaxi: la persona amb la que vaig parlar. I algunes altres opcions: Quan es celebrarà la festa?";
236236
tinyMCE.activeEditor.setContent(myDemoText);
237-
}
238-
239-
/** Contact form action **/
240-
var $contactForm = jQuery('#report_form');
241-
242-
$contactForm.on('submit', function(ev){
243-
ev.preventDefault();
244-
245-
//Data
246-
var post_data = new FormData();
247-
post_data.append('nom', jQuery('input[name=nom]').val());
248-
post_data.append('correu', jQuery('input[name=correu]').val());
249-
post_data.append('tipus', jQuery('#tipus_contacte option:selected').val());
250-
post_data.append('comentari', jQuery('#comentari').val());
251-
post_data.append('to_email', 'recursos@llistes.softcatala.org');
252-
post_data.append('nom_from', 'Corrector de Softcatalà');
253-
post_data.append('assumpte', '[Corrector] Contacte des del formulari');
254-
post_data.append('action', 'contact_form');
255-
256-
jQuery.ajax({
257-
type: 'POST',
258-
url: scajax.ajax_url,
259-
data: post_data,
260-
dataType: 'json',
261-
contentType: false,
262-
processData: false,
263-
success : form_sent_ok,
264-
error : form_sent_ko
265-
});
266-
});
267-
268-
function form_sent_ok(dt) {
269-
if (dt.type == 'message') {
270-
jQuery("#contingut-formulari").hide();
271-
jQuery("#contingut-formulari-response").empty().html(dt.text).fadeIn();
272-
}
273-
}
274-
275-
jQuery('#contact_traductor').click(function() {
276-
jQuery("#contingut-formulari-response").hide();
277-
jQuery("textarea[name='comentari']").val('');
278-
jQuery("#contingut-formulari").show();
279-
});
280-
281-
function form_sent_ko() {
282-
var message = 'Alguna cosa no ha funcionat bé en enviar les dades al servidor de traducció';
283-
jQuery("#contingut-formulari").hide();
284-
jQuery("#contingut-formulari-response").empty().html(message).fadeIn();
285-
}
286-
/** End contact form action **/
237+
}

‎static/js/multilingue.js

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -61,56 +61,6 @@ function ko_function(result) {
6161
jQuery('#results').slideDown();
6262
}
6363

64-
/** Contact form action **/
65-
var $contactForm = jQuery('#report_form');
66-
67-
$contactForm.on('submit', function(ev){
68-
ev.preventDefault();
69-
70-
//Data
71-
var post_data = new FormData();
72-
post_data.append('nom', jQuery('input[name=nom]').val());
73-
post_data.append('correu', jQuery('input[name=correu]').val());
74-
post_data.append('tipus', jQuery('#tipus_contacte option:selected').val());
75-
post_data.append('comentari', jQuery('#comentari').val());
76-
post_data.append('to_email', 'recursos@llistes.softcatala.org');
77-
post_data.append('nom_from', 'Diccionari de sinònims de Softcatalà');
78-
post_data.append('assumpte', '[Diccionari de sinònims] Contacte des del formulari');
79-
post_data.append('action', 'contact_form');
80-
post_data.append('_wpnonce', jQuery('input[name=_wpnonce]').val());
81-
82-
jQuery.ajax({
83-
type: 'POST',
84-
url: scajax.ajax_url,
85-
data: post_data,
86-
dataType: 'json',
87-
contentType: false,
88-
processData: false,
89-
success : form_sent_ok,
90-
error : form_sent_ko
91-
});
92-
});
93-
94-
function form_sent_ok(dt) {
95-
if (dt.type == 'message') {
96-
jQuery("#contingut-formulari").hide();
97-
jQuery("#contingut-formulari-response").empty().html(dt.text).fadeIn();
98-
}
99-
}
100-
101-
jQuery('#contact_traductor').click(function() {
102-
jQuery("#contingut-formulari-response").hide();
103-
jQuery("textarea[name='comentari']").val('');
104-
jQuery("#contingut-formulari").show();
105-
});
106-
107-
function form_sent_ko() {
108-
var message = 'Alguna cosa no ha funcionat bé en enviar les dades al servidor de traducció';
109-
jQuery("#contingut-formulari").hide();
110-
jQuery("#contingut-formulari-response").empty().html(message).fadeIn();
111-
}
112-
/** End contact form action **/
113-
11464
//Function to update share links on ajax calls
11565
function update_share_links(query) {
11666
var url = window.location.href;

0 commit comments

Comments
 (0)