Narine@NAIRA2-PC MINGW64 ~ $ cd c:/xampp/htdocs/sme_annual/sites/2016 Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git status On branch dev Your branch is up-to-date with 'origin/dev'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: modules/features/sme_global/sme_global.admin.inc modified: modules/features/sme_global/sme_global.module modified: themes/eventme/js/theme.js no changes added to commit (use "git add" and/or "git commit -a") Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git diff diff --git a/sites/2016/modules/features/sme_global/sme_global.admin.inc b/sites/2016/modules/features/sme_global/sme_global.admin.inc index cfeb656..c4a96b2 100644 --- a/sites/2016/modules/features/sme_global/sme_global.admin.inc +++ b/sites/2016/modules/features/sme_global/sme_global.admin.inc @@ -111,6 +111,51 @@ function _sme_global_addthis_block_form_submit($form, &$form_state) { } /** + * Twitter block config form + */ +function _sme_global_twitter_block_form($form,&$form_state) { + $twitter_title = variable_get('twitter_title', ''); + $twitter_embed = variable_get('twitter_embed', array()); + + + $form['twitter_title'] = array( + '#type' => 'textfield', + '#title' => 'Title', + '#default_value' => $twitter_title, + ); + $form['twitter_embed'] = array( Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git status On branch dev Your branch is up-to-date with 'origin/dev'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: modules/features/sme_global/sme_global.admin.inc modified: modules/features/sme_global/sme_global.module modified: themes/eventme/js/theme.js no changes added to commit (use "git add" and/or "git commit -a") Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git git status git: 'git' is not a git command. See 'git --help'. Did you mean this? init Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git status On branch dev Your branch is up-to-date with 'origin/dev'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: modules/features/sme_global/sme_global.admin.inc modified: modules/features/sme_global/sme_global.info modified: modules/features/sme_global/sme_global.module modified: modules/features/sme_global/sme_global.strongarm.inc modified: themes/eventme/css/eventme-custom-theme.css modified: themes/eventme/js/theme.js no changes added to commit (use "git add" and/or "git commit -a") Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git add --all warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.strongarm.inc. The file will have its original line endings in your working directory. Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git commit -a -m "Twitter config form" [dev warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.strongarm.inc. The file will have its original line endings in your working directory. b27c076] Twitter config form warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.strongarm.inc. The file will have its original line endings in your working directory. 6 files changed, 71 insertions(+), 15 deletions(-) Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git pull origin dev Enter passphrase for key '/c/Users/NAIRA/.ssh/id_rsa': From bitbucket.org:ectostar/sme-2016-annual * branch dev -> FETCH_HEAD Already up-to-date. Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git push origin dev Enter passphrase for key '/c/Users/NAIRA/.ssh/id_rsa': Counting objects: 17, done. Delta compression using up to 2 threads. Compressing objects: 100% (16/16), done. Writing objects: 100% (17/17), 1.51 KiB | 0 bytes/s, done. Total 17 (delta 13), reused 0 (delta 0) remote: remote: Create pull request for dev: remote: https://bitbucket.org/ectostar/sme-2016-annual/pull-requests/new?source=dev&t=1 remote: To git@bitbucket.org:ectostar/sme-2016-annual.git ef361e6..b27c076 dev -> dev Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ drush cc all 'all' cache was cleared in self [success] Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git status On branch dev Your branch is up-to-date with 'origin/dev'. nothing to commit, working directory clean Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git branch * dev master Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (dev) $ git checkout -b PROD Switched to a new branch 'PROD' Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (PROD) $ git status On branch PROD nothing to commit, working directory clean Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (PROD) $ git branch -v * PROD b27c076 Twitter config form dev b27c076 Twitter config form master 2e26016 [behind 4] Merge branch 'master' of bitbucket.org:ectostar/sme-2016-annual Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (PROD) $ git merge origin dev warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/LICENSE.txt. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/README.txt. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/README_devel_node_access.txt. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel-rtl.css. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.admin.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.css. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.drush.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.install. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.js. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.mail.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.module. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.pages.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.rules.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel.test. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/develDrushTest.php. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.drush.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.fields.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.module. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate.test. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/devel_generate_batch.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/file.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/image.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/list.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/number.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/taxonomy.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_generate/text.devel_generate.inc. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_krumo_path.js. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_node_access.api.php. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_node_access.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_node_access.install. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_node_access.js. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/devel_node_access.module. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/jquery-1.4.4-uncompressed.js. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/krumo/class.krumo.php. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/contrib/devel/runtests.sh. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.info. The file will have its original line endings in your working directory. warning: LF will be replaced by CRLF in sites/2016/modules/features/sme_global/sme_global.strongarm.inc. The file will have its original line endings in your working directory. Performing inexact rename detection: 100% (48400/48400), done. Merge made by the 'recursive' strategy. README.txt | 126 ++----------------------------------------------------------- 1 file changed, 3 insertions(+), 123 deletions(-) Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (PROD) $ git push origin PROD Enter passphrase for key '/c/Users/NAIRA/.ssh/id_rsa': Counting objects: 2, done. Delta compression using up to 2 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 314 bytes | 0 bytes/s, done. Total 2 (delta 1), reused 0 (delta 0) remote: remote: Create pull request for PROD: remote: https://bitbucket.org/ectostar/sme-2016-annual/pull-requests/new?source=PROD&t=1 remote: To git@bitbucket.org:ectostar/sme-2016-annual.git * [new branch] PROD -> PROD Narine@NAIRA2-PC MINGW64 /c/xampp/htdocs/sme_annual/sites/2016 (PROD)