API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 11th, 2018
223
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 60.77 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/.vagrant/machines/staging/managed/vagrant_cwd b/.vagrant/machines/staging/managed/vagrant_cwd
  2. deleted file mode 100644
  3. index 9ae457f..0000000
  4. --- a/.vagrant/machines/staging/managed/vagrant_cwd
  5. +++ /dev/null
  6. @@ -1 +0,0 @@
  7. -/Users/BrentEllis/Code/alumni_toolkit
  8. \ No newline at end of file
  9. diff --git a/deploy/config/sass-init b/deploy/config/sass-init
  10. old mode 100755
  11. new mode 100644
  12. diff --git a/deploy/config/sass-watch b/deploy/config/sass-watch
  13. old mode 100755
  14. new mode 100644
  15. diff --git a/deploy/scripts/init-puppet.sh b/deploy/scripts/init-puppet.sh
  16. old mode 100755
  17. new mode 100644
  18. diff --git a/deploy/scripts/vagrant-setup.bat b/deploy/scripts/vagrant-setup.bat
  19. old mode 100755
  20. new mode 100644
  21. diff --git a/deploy/scripts/vagrant-setup.sh b/deploy/scripts/vagrant-setup.sh
  22. old mode 100755
  23. new mode 100644
  24. diff --git a/downloads/sample_csv.csv b/downloads/sample_csv.csv
  25. index 41a4639..7f8341f 100644
  26. --- a/downloads/sample_csv.csv
  27. +++ b/downloads/sample_csv.csv
  28. @@ -1,24 +1,24 @@
  29. -first_name,last_name,email
  30. -Quentin,Del Viento,abc@gmail.com
  31. -Antoine,Del Torro,abc1@gmail.com
  32. -Arthur,Vincente,abc2@gmail.com
  33. -Quentin,Del Viento,abc@gmail.com
  34. -Antoine,Del Torro,abc1@gmail.com
  35. -Arthur,Vincente,abc2@gmail.com
  36. -Quentin,Del Viento,abc@gmail.com
  37. -Antoine,Del Torro,abc1@gmail.com
  38. -Arthur,Vincente,abc2@gmail.com
  39. -Quentin,Del Viento,abc@gmail.com
  40. -Antoine,Del Torro,abc1@gmail.com
  41. -Arthur,Vincente,abc2@gmail.com
  42. -Quentin,Del Viento,abc@gmail.com
  43. -Antoine,Del Torro,abc1@gmail.com
  44. -Arthur,Vincente,abc2@gmail.com
  45. -Quentin,Del Viento,abc@gmail.com
  46. -Antoine,Del Torro,abc1@gmail.com
  47. -Arthur,Vincente,abc2@gmail.com
  48. -Quentin,Del Viento,abc@gmail.com
  49. -Antoine,Del Torro,abc1@gmail.com
  50. -Arthur,Vincente,abc2@gmail.com
  51. -Quentin,Del Viento,abc@gmail.com
  52. -Antoine,Del Torro,abc1@gmail.com
  53. +first_name,last_name,email
  54. +Quentin,Del Viento,abc@gmail.com
  55. +Antoine,Del Torro,abc1@gmail.com
  56. +Arthur,Vincente,abc2@gmail.com
  57. +Quentin,Del Viento,abc@gmail.com
  58. +Antoine,Del Torro,abc1@gmail.com
  59. +Arthur,Vincente,abc2@gmail.com
  60. +Quentin,Del Viento,abc@gmail.com
  61. +Antoine,Del Torro,abc1@gmail.com
  62. +Arthur,Vincente,abc2@gmail.com
  63. +Quentin,Del Viento,abc@gmail.com
  64. +Antoine,Del Torro,abc1@gmail.com
  65. +Arthur,Vincente,abc2@gmail.com
  66. +Quentin,Del Viento,abc@gmail.com
  67. +Antoine,Del Torro,abc1@gmail.com
  68. +Arthur,Vincente,abc2@gmail.com
  69. +Quentin,Del Viento,abc@gmail.com
  70. +Antoine,Del Torro,abc1@gmail.com
  71. +Arthur,Vincente,abc2@gmail.com
  72. +Quentin,Del Viento,abc@gmail.com
  73. +Antoine,Del Torro,abc1@gmail.com
  74. +Arthur,Vincente,abc2@gmail.com
  75. +Quentin,Del Viento,abc@gmail.com
  76. +Antoine,Del Torro,abc1@gmail.com
  77. diff --git a/scripts/drupal.sh b/scripts/drupal.sh
  78. old mode 100755
  79. new mode 100644
  80. diff --git a/scripts/password-hash.sh b/scripts/password-hash.sh
  81. old mode 100755
  82. new mode 100644
  83. diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
  84. old mode 100755
  85. new mode 100644
  86. diff --git a/sites/all/modules/custom/atk/atk_stats.module b/sites/all/modules/custom/atk/atk_stats.module
  87. index bd18576..cf823d1 100644
  88. --- a/sites/all/modules/custom/atk/atk_stats.module
  89. +++ b/sites/all/modules/custom/atk/atk_stats.module
  90. @@ -1,5 +1,60 @@
  91. <?php
  92.  
  93. +/**
  94. + * Implements hook_menu().
  95. + */
  96. +function atk_stats_menu() {
  97. + $items['stats'] = array(
  98. + 'page callback' => 'atk_stats_stats_page',
  99. + 'access callback' => 'atk_stats_stats_access',
  100. + );
  101. + $items['stats/%/%'] = array(
  102. + 'page callback' => 'atk_stats_details_page',
  103. + 'page arguments' => array(1, 2),
  104. + 'access callback' => 'atk_stats_stats_access',
  105. + );
  106. + return $items;
  107. +}
  108. +
  109. +function atk_stats_stats_access() {
  110. + return true;
  111. +}
  112. +
  113. +function atk_stats_stats_page() {
  114. + $instances = field_info_instances('alumni', 'alumni');
  115. + $output = '<script>
  116. + jQuery(function($) {
  117. + $(\'table.tableheader-processed\').addClass(\'table\');
  118. + });
  119. +</script>
  120. +<style>
  121. + .messages {
  122. + display: none;
  123. + }
  124. + .col h2 {
  125. + visibility: hidden;
  126. + }
  127. + .col h3 {
  128. + margin-top: 50px;
  129. + }
  130. +</style>';
  131. + foreach($instances as $instance) {
  132. + $output .= '<h3>'.$instance['label'].'</h3>';
  133. + $report = new FieldAnalyticsReports($instance);
  134. + $output .= $report->reports();
  135. + }
  136. + return $output;
  137. +}
  138. +
  139. +function atk_stats_theme($existing, $type, $theme, $path) {
  140. + $items['atk_contact_upload_form'] = array(
  141. + 'render element' => 'form',
  142. + 'template' => 'atk_contact_upload_form',
  143. + 'path' => drupal_get_path('module', 'atk_contact_upload'),
  144. + );
  145. + return $items;
  146. +}
  147. +
  148. function atk_stats_node_view($node, $view_mode, $langcode) {
  149. if ($node->type == 'stats_page') {
  150.  
  151. @@ -68,9 +123,154 @@ function atk_stats_node_view($node, $view_mode, $langcode) {
  152. }
  153. unset($group);
  154. }
  155. + foreach($results['alumni'] as $alumni) {
  156. + $alumni = entity_metadata_wrapper('alumni', $alumni->id);
  157. + foreach($structure as &$group) {
  158. + foreach($group['fields'] as &$field) {
  159. + $val = $alumni->{$field['slug']}->value();
  160. + $fname = $field['slug'];
  161. + if (is_array($val)) {
  162. + foreach($val as $v) {
  163. + if (!empty($v->name)) {
  164. + $fval = $v->tid;
  165. + $field['stats'][$v->name] = "<a href=\"/stats/${fname}/${fval}\">" . $field['stats'][$v->name] . '</a>';
  166. + }
  167. + }
  168. + }
  169. + else if (!empty($val->name)) {
  170. + $fval = $val->tid;
  171. + $field['stats'][$val->name] = "<a href=\"/stats/${fname}/${fval}\">" . $field['stats'][$val->name] . '</a>';
  172. + }
  173. + else if ($val === true) {
  174. + $field['stats']['True'] = "<a href=\"/stats/${fname}/true\">" . $field['stats']['True'] . '</a>';
  175. + }
  176. + else if ($val === false) {
  177. + $field['stats']['False'] = "<a href=\"/stats/${fname}/false\">" . $field['stats']['False'] . '</a>';
  178. + }
  179. + else if ($val === null) {
  180. + $field['stats']['Unanswered'] = "<a href=\"/stats/${fname}/unanswered\">" . $field['stats']['Unanswered'] . '</a>';
  181. + }
  182. + else if (!empty($val)) {
  183. + $field['stats']['Text Answer'] = "<a href=\"/stats/${fname}/text\">" . $field['stats']['Text Answer'] . '</a>';
  184. + }
  185. + }
  186. + }
  187. + }
  188. }
  189.  
  190. $node->content['school'] = $school;
  191. $node->content['stats'] = $structure;
  192. }
  193. }
  194. +
  195. +function atk_stats_details_page($fieldname, $fieldvalue) {
  196. + if ($fieldvalue === 'true') {
  197. + $fieldvalue = 1;
  198. + }
  199. + else if ($fieldvalue === 'false') {
  200. + $fieldvalue = 0;
  201. + }
  202. + $instinfo = field_info_instance('alumni', $fieldname, 'alumni');
  203. + $fieldinfo = field_info_field($fieldname);
  204. + $showvalue = FALSE;
  205. + $query = new EntityFieldQuery();
  206. + $query->entityCondition('entity_type', 'alumni')->entityCondition('bundle', 'alumni');
  207. + $query->fieldname = $fieldname;
  208. + $query->fieldvalue = $fieldvalue;
  209. + if ($fieldinfo['type'] == 'taxonomy_term_reference') {
  210. + $vocab = $fieldinfo['settings']['allowed_values'][0]['vocabulary'];
  211. + if ($fieldvalue == 'unanswered') {
  212. + $titlevalue = 'Unanswered';
  213. + $query->addTag('atk_stats_unanswered_term');
  214. + }
  215. + else {
  216. + $term = taxonomy_term_load($fieldvalue);
  217. + $titlevalue = $term->name;
  218. + $query->fieldCondition($fieldname, 'tid', $fieldvalue);
  219. + }
  220. + }
  221. + else if ($fieldinfo['type'] == 'list_boolean') {
  222. + $titlevalue = 'No';
  223. + if ($fieldvalue == 'unanswered') {
  224. + $titlevalue = 'Unanswered';
  225. + $query->addTag('atk_stats_unanswered_bool');
  226. + }
  227. + else {
  228. + if ($fieldvalue) {
  229. + $titlevalue = 'Yes';
  230. + }
  231. + $query->fieldCondition($fieldname, 'value', $fieldvalue);
  232. + }
  233. + }
  234. + else if ($fieldinfo['type'] == 'text') {
  235. + $titlevalue = 'Custom';
  236. + $query->addTag('atk_stats_answered_text');
  237. + $showvalue = TRUE;
  238. + }
  239. + drupal_set_title($instinfo['label'] . ': ' . $titlevalue);
  240. + $results = $query->execute();
  241. + $rows = [];
  242. + if (empty($results['alumni'])) {
  243. + return array(
  244. + '#type' => 'markup',
  245. + '#markup' => t('No results found.')
  246. + );
  247. + }
  248. + else {
  249. + $alumnis = entity_load('alumni', array_keys($results['alumni']));
  250. + $alumni = reset($alumnis);
  251. + foreach($alumnis as &$alumni) {
  252. + $uid = $alumni->field_profile_user_id[LANGUAGE_NONE][0]['value'];
  253. + $name = $alumni->field_profile_user_name[LANGUAGE_NONE][0]['value'];
  254. + $tds = array();
  255. + $tds[] = $alumni->field_profile_user_name[LANGUAGE_NONE][0]['value'];
  256. + if ($showvalue) {
  257. + $tds[] = $alumni->$fieldname[LANGUAGE_NONE][0]['value'];
  258. + }
  259. + $tds[] = "<a href=\"/user/${uid}\">view</a>";
  260. + $rows[] = $tds;
  261. + }
  262. + }
  263. + $header = array();
  264. + $header[] = 'Alunmni';
  265. + if ($showvalue) {
  266. + $header[] = 'Custom value';
  267. + }
  268. + $header[] = 'View Profile';
  269. + return array(
  270. + '#theme' => 'table',
  271. + '#attributes' => array('style' => 'width: 100%; margin: 0 2em;'),
  272. + '#header' => $header,
  273. + '#rows' => $rows,
  274. + );
  275. +}
  276. +
  277. +/**
  278. + * Implements hook_query_TAG_alter() for atk_stats_unanswered_term.
  279. + */
  280. +function atk_stats_query_atk_stats_unanswered_term_alter(QueryAlterableInterface $query) {
  281. + $efq = $query->alterMetaData['entity_field_query'];
  282. + $fieldname = $efq->fieldname;
  283. + $query->leftJoin('field_data_' . $fieldname, 'o', 'eck_alumni.id = o.entity_id AND o.entity_type = :entity_type');
  284. + $query->isNull('o.' . $fieldname . '_tid');
  285. +}
  286. +
  287. +/**
  288. + * Implements hook_query_TAG_alter() for atk_stats_unanswered_bool.
  289. + */
  290. +function atk_stats_query_atk_stats_unanswered_bool_alter(QueryAlterableInterface $query) {
  291. + $efq = $query->alterMetaData['entity_field_query'];
  292. + $fieldname = $efq->fieldname;
  293. + $query->leftJoin('field_data_' . $fieldname, 'o', 'eck_alumni.id = o.entity_id AND o.entity_type = :entity_type');
  294. + $query->isNull('o.' . $fieldname . '_value');
  295. +}
  296. +
  297. +/**
  298. + * Implements hook_query_TAG_alter() for atk_stats_answered_text.
  299. + */
  300. +function atk_stats_query_atk_stats_answered_text_alter(QueryAlterableInterface $query) {
  301. + $efq = $query->alterMetaData['entity_field_query'];
  302. + $fieldname = $efq->fieldname;
  303. + $query->leftJoin('field_data_' . $fieldname, 'o', 'eck_alumni.id = o.entity_id AND o.entity_type = :entity_type');
  304. + $query->isNotNull('o.' . $fieldname . '_value');
  305. +}
  306. diff --git a/sites/all/modules/custom/atk/atk_stats.tpl.php b/sites/all/modules/custom/atk/atk_stats.tpl.php
  307. index 8df4fff..b3d9bbc 100644
  308. --- a/sites/all/modules/custom/atk/atk_stats.tpl.php
  309. +++ b/sites/all/modules/custom/atk/atk_stats.tpl.php
  310. @@ -1,51 +1 @@
  311. <?php
  312. -
  313. -/**
  314. - * Implements hook_menu().
  315. - */
  316. -function atk_stats_menu() {
  317. - $items['stats'] = array(
  318. - 'page callback' => 'atk_stats_stats_page',
  319. - 'access callback' => 'atk_stats_stats_access',
  320. - );
  321. - return $items;
  322. -}
  323. -
  324. -function atk_stats_stats_access() {
  325. - return true;
  326. -}
  327. -
  328. -function atk_stats_stats_page() {
  329. - $instances = field_info_instances('alumni', 'alumni');
  330. - $output = '<script>
  331. - jQuery(function($) {
  332. - $(\'table.tableheader-processed\').addClass(\'table\');
  333. - });
  334. -</script>
  335. -<style>
  336. - .messages {
  337. - display: none;
  338. - }
  339. - .col h2 {
  340. - visibility: hidden;
  341. - }
  342. - .col h3 {
  343. - margin-top: 50px;
  344. - }
  345. -</style>';
  346. - foreach($instances as $instance) {
  347. - $output .= '<h3>'.$instance['label'].'</h3>';
  348. - $report = new FieldAnalyticsReports($instance);
  349. - $output .= $report->reports();
  350. - }
  351. - return $output;
  352. -}
  353. -
  354. -function atk_stats_theme($existing, $type, $theme, $path) {
  355. - $items['atk_contact_upload_form'] = array(
  356. - 'render element' => 'form',
  357. - 'template' => 'atk_contact_upload_form',
  358. - 'path' => drupal_get_path('module', 'atk_contact_upload'),
  359. - );
  360. - return $items;
  361. -}
  362. diff --git a/sites/all/modules/custom/atk/atk_views/atk.views.inc b/sites/all/modules/custom/atk/atk_views/atk.views.inc
  363. index 7d3aa25..4971d0f 100644
  364. --- a/sites/all/modules/custom/atk/atk_views/atk.views.inc
  365. +++ b/sites/all/modules/custom/atk/atk_views/atk.views.inc
  366. @@ -1,61 +1,61 @@
  367. -<?php
  368. -
  369. -function atk_views_data() {
  370. - // Build an array named after each DB table you're describing. In our case,
  371. - // just mymodule_table.
  372. - $data['mymodule_table'] = array(
  373. - // First give some general information about the table as a data source.
  374. - 'table' => array(
  375. - // The grouping for this field/filter/sort in the Views UI.
  376. - 'group' => t('Example Views Stuff'),
  377. - 'base' => array(
  378. - 'field' => 'naid', // This is the identifier field for the view.
  379. - 'title' => t('Example Views API Data'),
  380. - 'help' => t('Names provided by the Mymodule module.'),
  381. - ),
  382. - ),
  383. - // Now we describe each field that Views needs to know about, starting
  384. - // with the identifier field.
  385. - 'naid' => array(
  386. - 'title' => t('Name ID'),
  387. - 'help' => t("The unique Name ID."),
  388. - 'field' => array(
  389. - 'handler' => 'views_handler_field_numeric',
  390. - 'click sortable' => TRUE,
  391. - ),
  392. - 'sort' => array(
  393. - 'handler' => 'views_handler_sort',
  394. - ),
  395. - 'filter' => array(
  396. - 'handler' => 'views_handler_filter_numeric',
  397. - ),
  398. - ),
  399. - // Now the name field.
  400. - 'name' => array(
  401. - 'title' => t('Name'),
  402. - 'help' => t("The Name."),
  403. - 'field' => array(
  404. - 'handler' => 'views_handler_field',
  405. - 'click sortable' => TRUE,
  406. - ),
  407. - 'sort' => array(
  408. - 'handler' => 'views_handler_sort',
  409. - ),
  410. - 'filter' => array(
  411. - 'handler' => 'views_handler_filter_string',
  412. - ),
  413. - ),
  414. - );
  415. - return $data;
  416. -}
  417. -
  418. -class mymodule_handler_field_firstname extends views_handler_field {
  419. - /**
  420. - * Render the name field.
  421. - */
  422. - public function render($values) {
  423. - $value = $this->get_value($values);
  424. - $return = explode(' ', $value);
  425. - return 'First name: ' . $return['0'];
  426. - }
  427. +<?php
  428. +
  429. +function atk_views_data() {
  430. + // Build an array named after each DB table you're describing. In our case,
  431. + // just mymodule_table.
  432. + $data['mymodule_table'] = array(
  433. + // First give some general information about the table as a data source.
  434. + 'table' => array(
  435. + // The grouping for this field/filter/sort in the Views UI.
  436. + 'group' => t('Example Views Stuff'),
  437. + 'base' => array(
  438. + 'field' => 'naid', // This is the identifier field for the view.
  439. + 'title' => t('Example Views API Data'),
  440. + 'help' => t('Names provided by the Mymodule module.'),
  441. + ),
  442. + ),
  443. + // Now we describe each field that Views needs to know about, starting
  444. + // with the identifier field.
  445. + 'naid' => array(
  446. + 'title' => t('Name ID'),
  447. + 'help' => t("The unique Name ID."),
  448. + 'field' => array(
  449. + 'handler' => 'views_handler_field_numeric',
  450. + 'click sortable' => TRUE,
  451. + ),
  452. + 'sort' => array(
  453. + 'handler' => 'views_handler_sort',
  454. + ),
  455. + 'filter' => array(
  456. + 'handler' => 'views_handler_filter_numeric',
  457. + ),
  458. + ),
  459. + // Now the name field.
  460. + 'name' => array(
  461. + 'title' => t('Name'),
  462. + 'help' => t("The Name."),
  463. + 'field' => array(
  464. + 'handler' => 'views_handler_field',
  465. + 'click sortable' => TRUE,
  466. + ),
  467. + 'sort' => array(
  468. + 'handler' => 'views_handler_sort',
  469. + ),
  470. + 'filter' => array(
  471. + 'handler' => 'views_handler_filter_string',
  472. + ),
  473. + ),
  474. + );
  475. + return $data;
  476. +}
  477. +
  478. +class mymodule_handler_field_firstname extends views_handler_field {
  479. + /**
  480. + * Render the name field.
  481. + */
  482. + public function render($values) {
  483. + $value = $this->get_value($values);
  484. + $return = explode(' ', $value);
  485. + return 'First name: ' . $return['0'];
  486. + }
  487. }
  488. \ No newline at end of file
  489. diff --git a/sites/all/modules/custom/features/accounts/accounts.features.field_base.inc b/sites/all/modules/custom/features/accounts/accounts.features.field_base.inc
  490. old mode 100755
  491. new mode 100644
  492. diff --git a/sites/all/modules/custom/features/accounts/accounts.features.field_instance.inc b/sites/all/modules/custom/features/accounts/accounts.features.field_instance.inc
  493. old mode 100755
  494. new mode 100644
  495. diff --git a/sites/all/modules/custom/features/accounts/accounts.features.taxonomy.inc b/sites/all/modules/custom/features/accounts/accounts.features.taxonomy.inc
  496. old mode 100755
  497. new mode 100644
  498. diff --git a/sites/all/modules/custom/features/accounts/accounts.features.user_permission.inc b/sites/all/modules/custom/features/accounts/accounts.features.user_permission.inc
  499. old mode 100755
  500. new mode 100644
  501. diff --git a/sites/all/modules/custom/features/accounts/accounts.info b/sites/all/modules/custom/features/accounts/accounts.info
  502. old mode 100755
  503. new mode 100644
  504. diff --git a/sites/all/modules/custom/features/accounts/accounts.module b/sites/all/modules/custom/features/accounts/accounts.module
  505. old mode 100755
  506. new mode 100644
  507. diff --git a/sites/all/modules/custom/features/alumni/alumni.features.field_base.inc b/sites/all/modules/custom/features/alumni/alumni.features.field_base.inc
  508. old mode 100755
  509. new mode 100644
  510. index 4eeb580..1c3e9fe
  511. --- a/sites/all/modules/custom/features/alumni/alumni.features.field_base.inc
  512. +++ b/sites/all/modules/custom/features/alumni/alumni.features.field_base.inc
  513. @@ -1216,8 +1216,8 @@ function alumni_field_default_field_bases() {
  514. 'locked' => 0,
  515. 'module' => 'computed_field',
  516. 'settings' => array(
  517. - 'code' => '$user = atk_user_apid($entity->id);
  518. -$school_id = (!empty($user) && !empty($user->field_school->value())) ? $user->field_school->tid->value() : null;
  519. + 'code' => '$user = atk_user_apid($entity->id);
  520. +$school_id = (!empty($user) && !empty($user->field_school->value())) ? $user->field_school->tid->value() : null;
  521. $entity_field[0][\'value\'] = $school_id;',
  522. 'database' => array(
  523. 'data_default' => '',
  524. @@ -1251,7 +1251,7 @@ $entity_field[0][\'value\'] = $school_id;',
  525. 'locked' => 0,
  526. 'module' => 'computed_field',
  527. 'settings' => array(
  528. - 'code' => '$user = atk_user_apid($entity->id);
  529. + 'code' => '$user = atk_user_apid($entity->id);
  530. $entity_field[0][\'value\'] = (!empty($user) && !empty($user->mail->value())) ? $user->mail->value() : \'\';',
  531. 'database' => array(
  532. 'data_default' => '',
  533. @@ -1319,7 +1319,7 @@ $entity_field[0][\'value\'] = (!empty($user) && !empty($user->field_year_graduat
  534. 'locked' => 0,
  535. 'module' => 'computed_field',
  536. 'settings' => array(
  537. - 'code' => '$user = atk_user_apid($entity->id);
  538. + 'code' => '$user = atk_user_apid($entity->id);
  539. $entity_field[0][\'value\'] = (!empty($user)) ? $user->getIdentifier() : null;',
  540. 'database' => array(
  541. 'data_default' => '',
  542. @@ -1353,10 +1353,10 @@ $entity_field[0][\'value\'] = (!empty($user)) ? $user->getIdentifier() : null;',
  543. 'locked' => 0,
  544. 'module' => 'computed_field',
  545. 'settings' => array(
  546. - 'code' => '$user = atk_user_apid($entity->id);
  547. -$fname = (!empty($user) && !empty($user->field_name->given->value())) ? $user->field_name->given->value() : \'\';
  548. -$lname = (!empty($user) && !empty($user->field_name->family->value())) ? $user->field_name->family->value() : \'\';
  549. -$uname = (!empty($user) && !empty($user->name->value())) ? $user->name->value() : null;
  550. + 'code' => '$user = atk_user_apid($entity->id);
  551. +$fname = (!empty($user) && !empty($user->field_name->given->value())) ? $user->field_name->given->value() : \'\';
  552. +$lname = (!empty($user) && !empty($user->field_name->family->value())) ? $user->field_name->family->value() : \'\';
  553. +$uname = (!empty($user) && !empty($user->name->value())) ? $user->name->value() : null;
  554. $entity_field[0][\'value\'] = (!empty($fname) || !empty($lname)) ? trim($fname.\' \'.$lname) : $uname;',
  555. 'database' => array(
  556. 'data_default' => '',
  557. diff --git a/sites/all/modules/custom/features/alumni/alumni.features.field_instance.inc b/sites/all/modules/custom/features/alumni/alumni.features.field_instance.inc
  558. old mode 100755
  559. new mode 100644
  560. diff --git a/sites/all/modules/custom/features/alumni/alumni.features.inc b/sites/all/modules/custom/features/alumni/alumni.features.inc
  561. old mode 100755
  562. new mode 100644
  563. diff --git a/sites/all/modules/custom/features/alumni/alumni.features.taxonomy.inc b/sites/all/modules/custom/features/alumni/alumni.features.taxonomy.inc
  564. old mode 100755
  565. new mode 100644
  566. diff --git a/sites/all/modules/custom/features/alumni/alumni.field_group.inc b/sites/all/modules/custom/features/alumni/alumni.field_group.inc
  567. old mode 100755
  568. new mode 100644
  569. diff --git a/sites/all/modules/custom/features/alumni/alumni.info b/sites/all/modules/custom/features/alumni/alumni.info
  570. old mode 100755
  571. new mode 100644
  572. diff --git a/sites/all/modules/custom/features/alumni/alumni.module b/sites/all/modules/custom/features/alumni/alumni.module
  573. old mode 100755
  574. new mode 100644
  575. diff --git a/sites/all/modules/custom/features/educator/educator.features.field_base.inc b/sites/all/modules/custom/features/educator/educator.features.field_base.inc
  576. old mode 100755
  577. new mode 100644
  578. diff --git a/sites/all/modules/custom/features/educator/educator.features.field_instance.inc b/sites/all/modules/custom/features/educator/educator.features.field_instance.inc
  579. old mode 100755
  580. new mode 100644
  581. diff --git a/sites/all/modules/custom/features/educator/educator.features.inc b/sites/all/modules/custom/features/educator/educator.features.inc
  582. old mode 100755
  583. new mode 100644
  584. diff --git a/sites/all/modules/custom/features/educator/educator.features.taxonomy.inc b/sites/all/modules/custom/features/educator/educator.features.taxonomy.inc
  585. old mode 100755
  586. new mode 100644
  587. diff --git a/sites/all/modules/custom/features/educator/educator.field_group.inc b/sites/all/modules/custom/features/educator/educator.field_group.inc
  588. old mode 100755
  589. new mode 100644
  590. diff --git a/sites/all/modules/custom/features/educator/educator.info b/sites/all/modules/custom/features/educator/educator.info
  591. old mode 100755
  592. new mode 100644
  593. diff --git a/sites/all/modules/custom/features/educator/educator.module b/sites/all/modules/custom/features/educator/educator.module
  594. old mode 100755
  595. new mode 100644
  596. diff --git a/sites/all/modules/custom/features/schools/schools.features.field_base.inc b/sites/all/modules/custom/features/schools/schools.features.field_base.inc
  597. old mode 100755
  598. new mode 100644
  599. diff --git a/sites/all/modules/custom/features/schools/schools.features.field_instance.inc b/sites/all/modules/custom/features/schools/schools.features.field_instance.inc
  600. old mode 100755
  601. new mode 100644
  602. diff --git a/sites/all/modules/custom/features/schools/schools.features.taxonomy.inc b/sites/all/modules/custom/features/schools/schools.features.taxonomy.inc
  603. old mode 100755
  604. new mode 100644
  605. diff --git a/sites/all/modules/custom/features/schools/schools.features.user_permission.inc b/sites/all/modules/custom/features/schools/schools.features.user_permission.inc
  606. old mode 100755
  607. new mode 100644
  608. diff --git a/sites/all/modules/custom/features/schools/schools.info b/sites/all/modules/custom/features/schools/schools.info
  609. old mode 100755
  610. new mode 100644
  611. diff --git a/sites/all/modules/custom/features/schools/schools.module b/sites/all/modules/custom/features/schools/schools.module
  612. old mode 100755
  613. new mode 100644
  614. diff --git a/sites/all/themes/atkv2/css/style.css b/sites/all/themes/atkv2/css/style.css
  615. old mode 100755
  616. new mode 100644
  617. diff --git a/sites/all/themes/atkv2/css/style.css.map b/sites/all/themes/atkv2/css/style.css.map
  618. old mode 100755
  619. new mode 100644
  620. diff --git a/sites/all/themes/atkv2/js/site.js b/sites/all/themes/atkv2/js/site.js
  621. index 327f743..014bf6c 100644
  622. --- a/sites/all/themes/atkv2/js/site.js
  623. +++ b/sites/all/themes/atkv2/js/site.js
  624. @@ -22,12 +22,12 @@ newJq(function($) {
  625. }
  626. $('.form-item-field-school-und label').text($('.form-item-field-school-und label').text()+' *');
  627.  
  628. - $('div.messages').each(function() {
  629. + /*$('div.messages').each(function() {
  630. var $this = $(this);
  631. setTimeout(function() {
  632. $this.slideUp();
  633. }, 10000);
  634. - });
  635. + });*/
  636.  
  637. });
  638.  
  639. diff --git a/sites/all/themes/atkv2/templates/html.tpl.php b/sites/all/themes/atkv2/templates/html.tpl.php
  640. old mode 100755
  641. new mode 100644
  642. index b91fe32..99f515b
  643. --- a/sites/all/themes/atkv2/templates/html.tpl.php
  644. +++ b/sites/all/themes/atkv2/templates/html.tpl.php
  645. @@ -49,5 +49,15 @@
  646. <?php include('inc/footer.php'); ?>
  647. </div>
  648.  
  649. +<!-- Global site tag (gtag.js) - Google Analytics -->
  650. +<script async src="https://www.googletagmanager.com/gtag/js?id=UA-53094814-1"></script>
  651. +<script>
  652. + window.dataLayer = window.dataLayer || [];
  653. + function gtag(){dataLayer.push(arguments);}
  654. + gtag('js', new Date());
  655. +
  656. + gtag('config', 'UA-53094814-1');
  657. +</script>
  658. +
  659. </body>
  660. </html>
  661. diff --git a/sites/all/themes/atkv2/templates/mail/mimemail-message.tpl.php b/sites/all/themes/atkv2/templates/mail/mimemail-message.tpl.php
  662. index 5883a7a..4089de1 100644
  663. --- a/sites/all/themes/atkv2/templates/mail/mimemail-message.tpl.php
  664. +++ b/sites/all/themes/atkv2/templates/mail/mimemail-message.tpl.php
  665. @@ -1,85 +1,85 @@
  666. -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  667. -<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
  668. -<head>
  669. - <meta name="viewport" content="width=device-width" />
  670. - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  671. - <title>Alerts e.g. approaching your limit</title>
  672. -
  673. -
  674. - <style type="text/css">
  675. - img {
  676. - max-width: 100%;
  677. - }
  678. - body {
  679. - -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
  680. - }
  681. - body {
  682. - background-color: #f6f6f6;
  683. - }
  684. - @media only screen and (max-width: 640px) {
  685. - body {
  686. - padding: 0 !important;
  687. - }
  688. - h1 {
  689. - font-weight: 800 !important; margin: 20px 0 5px !important;
  690. - }
  691. - h2 {
  692. - font-weight: 800 !important; margin: 20px 0 5px !important;
  693. - }
  694. - h3 {
  695. - font-weight: 800 !important; margin: 20px 0 5px !important;
  696. - }
  697. - h4 {
  698. - font-weight: 800 !important; margin: 20px 0 5px !important;
  699. - }
  700. - h1 {
  701. - font-size: 22px !important;
  702. - }
  703. - h2 {
  704. - font-size: 18px !important;
  705. - }
  706. - h3 {
  707. - font-size: 16px !important;
  708. - }
  709. - .container {
  710. - padding: 0 !important; width: 100% !important;
  711. - }
  712. - .content {
  713. - padding: 0 !important;
  714. - }
  715. - .content-wrap {
  716. - padding: 10px !important;
  717. - }
  718. - .invoice {
  719. - width: 100% !important;
  720. - }
  721. - }
  722. - </style>
  723. -</head>
  724. -
  725. -<body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
  726. -
  727. -<table class="body-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  728. - <td class="container" width="600" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
  729. - <div class="content" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
  730. - <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 18px; vertical-align: top; color: #fff; font-weight: bold; text-align: center; border-radius: 3px 3px 0 0; background-color: #6BCAF0; margin: 0; padding: 10px;" align="center" bgcolor="#6BCAF0" valign="top">
  731. - Alumni Toolkit
  732. - </td>
  733. - </tr><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
  734. - <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  735. - <?php echo ($body); ?>
  736. - </td>
  737. - </tr><?php if (!empty($message['button']['label']) && !empty($message['button']['link'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  738. - <a href="<?php echo $message['button']['link']; ?>" class="btn-primary" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #146cb6; margin: 0; border-color: #146cb6; border-style: solid; border-width: 10px 20px;"><?php echo $message['button']['label']; ?></a>
  739. - </td>
  740. - </tr><?php endif; ?><?php if (!empty($message['afterbutton'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  741. - <?php echo $message['afterbutton']; ?>
  742. - </td>
  743. - </tr><?php endif; ?></table></td>
  744. - </tr></table><?php if (!empty($message['tag'])): ?><div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
  745. - <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"><?php echo $message['tag']; ?></td>
  746. - </tr></table></div><?php endif; ?></div>
  747. - </td>
  748. - <td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  749. - </tr></table></body>
  750. +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  751. +<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
  752. +<head>
  753. + <meta name="viewport" content="width=device-width" />
  754. + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  755. + <title>Alerts e.g. approaching your limit</title>
  756. +
  757. +
  758. + <style type="text/css">
  759. + img {
  760. + max-width: 100%;
  761. + }
  762. + body {
  763. + -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
  764. + }
  765. + body {
  766. + background-color: #f6f6f6;
  767. + }
  768. + @media only screen and (max-width: 640px) {
  769. + body {
  770. + padding: 0 !important;
  771. + }
  772. + h1 {
  773. + font-weight: 800 !important; margin: 20px 0 5px !important;
  774. + }
  775. + h2 {
  776. + font-weight: 800 !important; margin: 20px 0 5px !important;
  777. + }
  778. + h3 {
  779. + font-weight: 800 !important; margin: 20px 0 5px !important;
  780. + }
  781. + h4 {
  782. + font-weight: 800 !important; margin: 20px 0 5px !important;
  783. + }
  784. + h1 {
  785. + font-size: 22px !important;
  786. + }
  787. + h2 {
  788. + font-size: 18px !important;
  789. + }
  790. + h3 {
  791. + font-size: 16px !important;
  792. + }
  793. + .container {
  794. + padding: 0 !important; width: 100% !important;
  795. + }
  796. + .content {
  797. + padding: 0 !important;
  798. + }
  799. + .content-wrap {
  800. + padding: 10px !important;
  801. + }
  802. + .invoice {
  803. + width: 100% !important;
  804. + }
  805. + }
  806. + </style>
  807. +</head>
  808. +
  809. +<body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
  810. +
  811. +<table class="body-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  812. + <td class="container" width="600" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
  813. + <div class="content" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
  814. + <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 18px; vertical-align: top; color: #fff; font-weight: bold; text-align: center; border-radius: 3px 3px 0 0; background-color: #6BCAF0; margin: 0; padding: 10px;" align="center" bgcolor="#6BCAF0" valign="top">
  815. + Alumni Toolkit
  816. + </td>
  817. + </tr><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
  818. + <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  819. + <?php echo ($body); ?>
  820. + </td>
  821. + </tr><?php if (!empty($message['button']['label']) && !empty($message['button']['link'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  822. + <a href="<?php echo $message['button']['link']; ?>" class="btn-primary" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #146cb6; margin: 0; border-color: #146cb6; border-style: solid; border-width: 10px 20px;"><?php echo $message['button']['label']; ?></a>
  823. + </td>
  824. + </tr><?php endif; ?><?php if (!empty($message['afterbutton'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  825. + <?php echo $message['afterbutton']; ?>
  826. + </td>
  827. + </tr><?php endif; ?></table></td>
  828. + </tr></table><?php if (!empty($message['tag'])): ?><div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
  829. + <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"><?php echo $message['tag']; ?></td>
  830. + </tr></table></div><?php endif; ?></div>
  831. + </td>
  832. + <td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  833. + </tr></table></body>
  834. </html>
  835. \ No newline at end of file
  836. diff --git a/sites/all/themes/atkv2/templates/node.tpl.php b/sites/all/themes/atkv2/templates/node.tpl.php
  837. old mode 100755
  838. new mode 100644
  839. diff --git a/sites/all/themes/atkv2/templates/page.tpl.php b/sites/all/themes/atkv2/templates/page.tpl.php
  840. old mode 100755
  841. new mode 100644
  842. diff --git a/sites/all/themes/atkv2/templates/user-login.tpl.php b/sites/all/themes/atkv2/templates/user-login.tpl.php
  843. index a761b52..5bee95b 100644
  844. --- a/sites/all/themes/atkv2/templates/user-login.tpl.php
  845. +++ b/sites/all/themes/atkv2/templates/user-login.tpl.php
  846. @@ -1,22 +1,22 @@
  847. -<p><?php print render($intro_text); ?></p>
  848. -<div class="form-group row">
  849. - <label for="email_form_to" class="col-2 col-form-label">Name</label>
  850. - <div class="col-10">
  851. - <?php echo render($form['name']); ?>
  852. - </div>
  853. -</div>
  854. -<div class="form-group row">
  855. - <label for="email_form_subject" class="col-2 col-form-label">Password</label>
  856. - <div class="col-10">
  857. - <?php echo render($form['pass']); ?>
  858. - </div>
  859. -</div>
  860. -<div class="form-group row">
  861. - <div class="col-10 offset-2">
  862. - <?php
  863. - $form['actions']['submit']['#attributes']['class'][] = 'btn btn-primary';
  864. - echo render($form['actions']);
  865. - ?>
  866. - </div>
  867. -</div>
  868. -<?php print drupal_render_children($form); ?>
  869. +<p><?php print render($intro_text); ?></p>
  870. +<div class="form-group row">
  871. + <label for="email_form_to" class="col-2 col-form-label">Name</label>
  872. + <div class="col-10">
  873. + <?php echo render($form['name']); ?>
  874. + </div>
  875. +</div>
  876. +<div class="form-group row">
  877. + <label for="email_form_subject" class="col-2 col-form-label">Password</label>
  878. + <div class="col-10">
  879. + <?php echo render($form['pass']); ?>
  880. + </div>
  881. +</div>
  882. +<div class="form-group row">
  883. + <div class="col-10 offset-2">
  884. + <?php
  885. + $form['actions']['submit']['#attributes']['class'][] = 'btn btn-primary';
  886. + echo render($form['actions']);
  887. + ?>
  888. + </div>
  889. +</div>
  890. +<?php print drupal_render_children($form); ?>
  891. diff --git a/sites/all/themes/atkv2_admin/atkv2_admin.info b/sites/all/themes/atkv2_admin/atkv2_admin.info
  892. index c173b75..652c0c0 100644
  893. --- a/sites/all/themes/atkv2_admin/atkv2_admin.info
  894. +++ b/sites/all/themes/atkv2_admin/atkv2_admin.info
  895. @@ -1,4 +1,4 @@
  896. -name = AlumniToolkit V2 Admin
  897. -description = Adminimal subtheme for schools.alumnitoolkit.org theme, version 2.
  898. -core = 7.x
  899. -base theme = adminimal
  900. +name = AlumniToolkit V2 Admin
  901. +description = Adminimal subtheme for schools.alumnitoolkit.org theme, version 2.
  902. +core = 7.x
  903. +base theme = adminimal
  904. diff --git a/sites/all/themes/atkv2_admin/templates/mail/mimemail-message.tpl.php b/sites/all/themes/atkv2_admin/templates/mail/mimemail-message.tpl.php
  905. index 5883a7a..4089de1 100644
  906. --- a/sites/all/themes/atkv2_admin/templates/mail/mimemail-message.tpl.php
  907. +++ b/sites/all/themes/atkv2_admin/templates/mail/mimemail-message.tpl.php
  908. @@ -1,85 +1,85 @@
  909. -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  910. -<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
  911. -<head>
  912. - <meta name="viewport" content="width=device-width" />
  913. - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  914. - <title>Alerts e.g. approaching your limit</title>
  915. -
  916. -
  917. - <style type="text/css">
  918. - img {
  919. - max-width: 100%;
  920. - }
  921. - body {
  922. - -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
  923. - }
  924. - body {
  925. - background-color: #f6f6f6;
  926. - }
  927. - @media only screen and (max-width: 640px) {
  928. - body {
  929. - padding: 0 !important;
  930. - }
  931. - h1 {
  932. - font-weight: 800 !important; margin: 20px 0 5px !important;
  933. - }
  934. - h2 {
  935. - font-weight: 800 !important; margin: 20px 0 5px !important;
  936. - }
  937. - h3 {
  938. - font-weight: 800 !important; margin: 20px 0 5px !important;
  939. - }
  940. - h4 {
  941. - font-weight: 800 !important; margin: 20px 0 5px !important;
  942. - }
  943. - h1 {
  944. - font-size: 22px !important;
  945. - }
  946. - h2 {
  947. - font-size: 18px !important;
  948. - }
  949. - h3 {
  950. - font-size: 16px !important;
  951. - }
  952. - .container {
  953. - padding: 0 !important; width: 100% !important;
  954. - }
  955. - .content {
  956. - padding: 0 !important;
  957. - }
  958. - .content-wrap {
  959. - padding: 10px !important;
  960. - }
  961. - .invoice {
  962. - width: 100% !important;
  963. - }
  964. - }
  965. - </style>
  966. -</head>
  967. -
  968. -<body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
  969. -
  970. -<table class="body-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  971. - <td class="container" width="600" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
  972. - <div class="content" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
  973. - <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 18px; vertical-align: top; color: #fff; font-weight: bold; text-align: center; border-radius: 3px 3px 0 0; background-color: #6BCAF0; margin: 0; padding: 10px;" align="center" bgcolor="#6BCAF0" valign="top">
  974. - Alumni Toolkit
  975. - </td>
  976. - </tr><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
  977. - <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  978. - <?php echo ($body); ?>
  979. - </td>
  980. - </tr><?php if (!empty($message['button']['label']) && !empty($message['button']['link'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  981. - <a href="<?php echo $message['button']['link']; ?>" class="btn-primary" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #146cb6; margin: 0; border-color: #146cb6; border-style: solid; border-width: 10px 20px;"><?php echo $message['button']['label']; ?></a>
  982. - </td>
  983. - </tr><?php endif; ?><?php if (!empty($message['afterbutton'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  984. - <?php echo $message['afterbutton']; ?>
  985. - </td>
  986. - </tr><?php endif; ?></table></td>
  987. - </tr></table><?php if (!empty($message['tag'])): ?><div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
  988. - <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"><?php echo $message['tag']; ?></td>
  989. - </tr></table></div><?php endif; ?></div>
  990. - </td>
  991. - <td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  992. - </tr></table></body>
  993. +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  994. +<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
  995. +<head>
  996. + <meta name="viewport" content="width=device-width" />
  997. + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  998. + <title>Alerts e.g. approaching your limit</title>
  999. +
  1000. +
  1001. + <style type="text/css">
  1002. + img {
  1003. + max-width: 100%;
  1004. + }
  1005. + body {
  1006. + -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
  1007. + }
  1008. + body {
  1009. + background-color: #f6f6f6;
  1010. + }
  1011. + @media only screen and (max-width: 640px) {
  1012. + body {
  1013. + padding: 0 !important;
  1014. + }
  1015. + h1 {
  1016. + font-weight: 800 !important; margin: 20px 0 5px !important;
  1017. + }
  1018. + h2 {
  1019. + font-weight: 800 !important; margin: 20px 0 5px !important;
  1020. + }
  1021. + h3 {
  1022. + font-weight: 800 !important; margin: 20px 0 5px !important;
  1023. + }
  1024. + h4 {
  1025. + font-weight: 800 !important; margin: 20px 0 5px !important;
  1026. + }
  1027. + h1 {
  1028. + font-size: 22px !important;
  1029. + }
  1030. + h2 {
  1031. + font-size: 18px !important;
  1032. + }
  1033. + h3 {
  1034. + font-size: 16px !important;
  1035. + }
  1036. + .container {
  1037. + padding: 0 !important; width: 100% !important;
  1038. + }
  1039. + .content {
  1040. + padding: 0 !important;
  1041. + }
  1042. + .content-wrap {
  1043. + padding: 10px !important;
  1044. + }
  1045. + .invoice {
  1046. + width: 100% !important;
  1047. + }
  1048. + }
  1049. + </style>
  1050. +</head>
  1051. +
  1052. +<body itemscope itemtype="http://schema.org/EmailMessage" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6">
  1053. +
  1054. +<table class="body-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  1055. + <td class="container" width="600" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
  1056. + <div class="content" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; max-width: 600px; display: block; margin: 0 auto; padding: 20px;">
  1057. + <table class="main" width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; border-radius: 3px; background-color: #fff; margin: 0; border: 1px solid #e9e9e9;" bgcolor="#fff"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="alert alert-warning" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 18px; vertical-align: top; color: #fff; font-weight: bold; text-align: center; border-radius: 3px 3px 0 0; background-color: #6BCAF0; margin: 0; padding: 10px;" align="center" bgcolor="#6BCAF0" valign="top">
  1058. + Alumni Toolkit
  1059. + </td>
  1060. + </tr><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-wrap" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 20px;" valign="top">
  1061. + <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  1062. + <?php echo ($body); ?>
  1063. + </td>
  1064. + </tr><?php if (!empty($message['button']['label']) && !empty($message['button']['link'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  1065. + <a href="<?php echo $message['button']['link']; ?>" class="btn-primary" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #146cb6; margin: 0; border-color: #146cb6; border-style: solid; border-width: 10px 20px;"><?php echo $message['button']['label']; ?></a>
  1066. + </td>
  1067. + </tr><?php endif; ?><?php if (!empty($message['afterbutton'])): ?><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
  1068. + <?php echo $message['afterbutton']; ?>
  1069. + </td>
  1070. + </tr><?php endif; ?></table></td>
  1071. + </tr></table><?php if (!empty($message['tag'])): ?><div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
  1072. + <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;"><td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"><?php echo $message['tag']; ?></td>
  1073. + </tr></table></div><?php endif; ?></div>
  1074. + </td>
  1075. + <td style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top"></td>
  1076. + </tr></table></body>
  1077. </html>
  1078. \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!