[EGIT] [website/www-content] master 01/01: e www - docs - add since area for docs to show since what version
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f292f80dfb391ec6bdee46030f982c6777301a1a commit f292f80dfb391ec6bdee46030f982c6777301a1a Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue Apr 14 21:10:01 2015 +0900 e www - docs - add since area for docs to show since what version fleshing out to look for comments as to formatting/style/content --- pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt | 9 - pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt | 6 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt b/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt index bcf072e..73b7114 100644 --- a/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt +++ b/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt @@ -29,14 +29,21 @@ time. Note that all objects contained in an Evas canvas are deleted when the canvas is deleted, so there is no neeed to go delete them separately. - + sub//Since 1.0///sub + == See Also == code c evas_object_hide() evas_object_ref() evas_object_unref() +/code + +code c EVAS_CALLBACK_DEL EVAS_CALLBACK_FREE EVAS_CALLBACK_FOCUS_OUT +/code + +code c Evas_Object /code diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt b/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt index 149fea3..1def77f 100644 --- a/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt +++ b/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt @@ -28,10 +28,14 @@ this point, if it should be. evas_object_unref(obj); /code - + sub//Since 1.0///sub + == See Also == code c evas_object_del() evas_object_unref() +/code + +code c Evas_Object /code --
[EGIT] [website/www] master 01/01: add docs on how to set up a local dokuwiki and sample config
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=5098c932c4da40bded1ea127b49c5de0de80ef41 commit 5098c932c4da40bded1ea127b49c5de0de80ef41 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon Apr 20 14:27:40 2015 +0900 add docs on how to set up a local dokuwiki and sample config --- README | 40 ++- local.php.sample | 96 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/README b/README index cd439f9..de9a782 100644 --- a/README +++ b/README @@ -1,2 +1,40 @@ -under public_html is a dokuwiki tree with plugins enabled, some config +Under public_html is a dokuwiki tree with plugins enabled, some config and a template made to work with e.org. this does NOT contain content. + +To help do things nicely, you probably want to set up this tree +locally and run an apache (or ngix or whatever you prefer) and ensure +it can do php5 or better. + +You will want to: + + cp local.php.sample public_html/conf/local.php + +and then modify $conf['datadir'] and $conf['mediadir'] to point to the +paged and media subdirs of the www-content git that you can get on +http://git.enlightenment.org as well. You can also symlink the +www-content dir from the public_html/data dir like: + + ln -s /path/to/www-content public_html/data/www-content + +as an alternative. + +The first time you run your local webserver and go there, you may get +permission denied problems. You may have to either make your www tree +owned by your http server, or run your webserver as you. You will get +to set up an admin account the first time if all directories are +accessible correctly. You are now pretty much done. Enjoy your local +wiki install and save time by not having to comit changes to the wiki +before testing. + +Note that we want to keep changes to the wiki tself at a minimum beyond: + + 1. installing PRISTINE plugins (with as few or no changes as possible) + 2. modifying the public_html/lib/tpl/e subdirectory where the + css/templates etc. live for the look and feel. + +If you do change things, please start your commit log line with the +all caps: + + WIKI CUSTOM + +So we can easily find it later for upgrades. diff --git a/local.php.sample b/local.php.sample new file mode 100644 index 000..67c6030 --- /dev/null +++ b/local.php.sample @@ -0,0 +1,96 @@ +?php +/* + * Dokuwiki's Main Configuration File - Local Settings + * Auto-generated by config plugin + * Run for user: beber + * Date: Sat, 11 Apr 2015 14:51:26 -0700 + */ + +$conf['title'] = ''; +$conf['template'] = 'e'; +$conf['license'] = '0'; +$conf['recent'] = 0; +$conf['recent_days'] = 0; +$conf['breadcrumbs'] = 0; +$conf['dformat'] = ''; +$conf['tocminheads'] = '20'; +$conf['maxtoclevel'] = '0'; +$conf['maxseclevel'] = '0'; +$conf['useheading'] = '1'; +$conf['useacl'] = 1; +$conf['passcrypt'] = 'sha512'; +$conf['superuser'] = '@admin'; +$conf['disableactions'] = 'recent,revisions'; +$conf['jpg_quality'] = 90; +$conf['subscribers'] = 1; +$conf['mailfrom'] = 'no-re...@enlightenment.org'; +$conf['mailprefix'] = 'Enlightenment'; +$conf['sitemap'] = 1; +$conf['updatecheck'] = 0; +$conf['userewrite'] = '1'; +$conf['useslash'] = 1; +$conf['compress'] = 0; +$conf['send404'] = 1; +$conf['compression'] = '0'; +$conf['plugin']['include']['showfooter'] = 0; +$conf['plugin']['include']['showdate'] = 0; +$conf['plugin']['include']['showuser'] = 0; +$conf['plugin']['include']['showcomments'] = 0; +$conf['plugin']['include']['showlinkbacks'] = 0; +$conf['plugin']['include']['showtags'] = 0; +$conf['plugin']['include']['showeditbtn'] = 0; +$conf['plugin']['include']['doredirect'] = 0; +$conf['plugin']['include']['doindent'] = 0; +$conf['plugin']['include']['parlink'] = 0; +$conf['plugin']['include']['safeindex'] = 0; +$conf['plugin']['include']['readmore'] = 0; +$conf['plugin']['captcha']['mode'] = 'audio'; +$conf['plugin']['captcha']['width'] = 300; +$conf['plugin']['captcha']['height'] = 100; +$conf['plugin']['discussion']['allowguests'] = 0; +$conf['plugin']['discussion']['urlfield'] = 1; +$conf['plugin']['discussion']['moderatorgroups'] = 'admin,edit'; +$conf['plugin']['gitbacked']['pushAfterCommit'] = 0; +$conf['plugin']['gitbacked']['periodicPull'] = 0; +$conf['plugin']['gitbacked']['periodicMinutes'] = 0; +$conf['plugin']['gitbacked']['repoPath'] = 'data/www-content'; +$conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp'; +$conf['tpl']['dokui']['hide-entry-title'] = '1'; +$conf['datadir'] = 'data/www-content/pages'; +$conf['mediadir'] = 'data/www-content/media'; +/* new config - patches to dokuwiki enabled this. this is a directory + * realtive to 'datadir' config above where we store metadata right in the + * wiki itself to holid linking and documentation for keywords in specific + * languages like c, lua, cpp, js, python etc. you need the below directory + * and then like + * $dir/$language/keyword
[EGIT] [website/www] master 02/02: WIKI CUSTOM - disable lowercasing of wiki page names so docs can work
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=49a44ed9f316ac34014d04513fbc5dd4dad048d0 commit 49a44ed9f316ac34014d04513fbc5dd4dad048d0 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 15:27:32 2015 +0900 WIKI CUSTOM - disable lowercasing of wiki page names so docs can work our docs will need casing to work as the languages they document ddifferentaite case and our links link to a page of the name of the keyword - WITH CASE KEPT. --- public_html/inc/pageutils.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public_html/inc/pageutils.php b/public_html/inc/pageutils.php index 3757126..9b01662 100644 --- a/public_html/inc/pageutils.php +++ b/public_html/inc/pageutils.php @@ -119,7 +119,8 @@ function cleanID($raw_id,$ascii=false){ $sepcharpat = '#\\'.$sepchar.'+#'; $id = trim((string)$raw_id); -$id = utf8_strtolower($id); +// stop lower-casing links - we need this for our docs to work. case matters +//$id = utf8_strtolower($id); //alternative namespace seperator if($conf['useslash']){ --
[EGIT] [website/www] master 01/02: www - update sample local.php
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=a610572ca56aa7dde9dd3157c0642332a6c5ac5a commit a610572ca56aa7dde9dd3157c0642332a6c5ac5a Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 14:59:43 2015 +0900 www - update sample local.php --- local.php.sample | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/local.php.sample b/local.php.sample index 67c6030..4aaa05a 100644 --- a/local.php.sample +++ b/local.php.sample @@ -22,6 +22,7 @@ $conf['passcrypt'] = 'sha512'; $conf['superuser'] = '@admin'; $conf['disableactions'] = 'recent,revisions'; $conf['jpg_quality'] = 90; +$conf['fetchsize'] = 500; $conf['subscribers'] = 1; $conf['mailfrom'] = 'no-re...@enlightenment.org'; $conf['mailprefix'] = 'Enlightenment'; @@ -38,7 +39,7 @@ $conf['plugin']['include']['showuser'] = 0; $conf['plugin']['include']['showcomments'] = 0; $conf['plugin']['include']['showlinkbacks'] = 0; $conf['plugin']['include']['showtags'] = 0; -$conf['plugin']['include']['showeditbtn'] = 0; +$conf['plugin']['include']['showeditbtn'] = 1; $conf['plugin']['include']['doredirect'] = 0; $conf['plugin']['include']['doindent'] = 0; $conf['plugin']['include']['parlink'] = 0; --
[EGIT] [website/www-content] master 01/01: web code links - fix to not lower case them
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f89b39b8739ef5304d0af8e2baea3849973671f1 commit f89b39b8739ef5304d0af8e2baea3849973671f1 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 15:20:00 2015 +0900 web code links - fix to not lower case them --- pages/docs/efl/ref/c/keyword-link.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/docs/efl/ref/c/keyword-link.txt b/pages/docs/efl/ref/c/keyword-link.txt index a030b1a..2eabec3 100644 --- a/pages/docs/efl/ref/c/keyword-link.txt +++ b/pages/docs/efl/ref/c/keyword-link.txt @@ -1 +1 @@ -/docs/efl/ref/c/key/{FNAMEL} +/docs/efl/ref/c/key/{FNAME} --
[EGIT] [website/www] master 01/01: WIKI CUSTOM - add codelink plugin to auto-link pages with keywords
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=828f80b5fcf1f6e1f5dfdb76515502303415fca2 commit 828f80b5fcf1f6e1f5dfdb76515502303415fca2 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 18:07:07 2015 +0900 WIKI CUSTOM - add codelink plugin to auto-link pages with keywords this will find keywords registered for extension like we added in a patch to geshi and dokuwiki core in regular paragraphs and auto-link them like the geshi blocks to the reference docs. pages need to know what language they are in so before you have any links working, you need to declare a language like: ~~CODE-c~~ --- public_html/lib/plugins/codelink/README | 27 + public_html/lib/plugins/codelink/plugin.info.txt | 7 ++ public_html/lib/plugins/codelink/syntax.php | 131 +++ 3 files changed, 165 insertions(+) diff --git a/public_html/lib/plugins/codelink/README b/public_html/lib/plugins/codelink/README new file mode 100644 index 000..0afee5d --- /dev/null +++ b/public_html/lib/plugins/codelink/README @@ -0,0 +1,27 @@ +codelink Plugin for DokuWiki + +Link code keywords from regular wiki markdown not just code blocks + +All documentation for this plugin can be found at +http://www.enlightenment.org + +If you install this plugin manually, make sure it is installed in +lib/plugins/codelink/ - if the folder is called different it +will not work! + +Please refer to http://www.dokuwiki.org/plugins for additional info +on how to install plugins in DokuWiki. + + +Copyright (C) Carsten Haitzler ras...@rasterman.com + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +See the COPYING file in your DokuWiki folder for details diff --git a/public_html/lib/plugins/codelink/plugin.info.txt b/public_html/lib/plugins/codelink/plugin.info.txt new file mode 100644 index 000..cb9afb1 --- /dev/null +++ b/public_html/lib/plugins/codelink/plugin.info.txt @@ -0,0 +1,7 @@ +base codelink +author Carsten Haitzler +email ras...@rasterman.com +date 2015-04-24 +name codelink plugin +desc Link code keywords from regular wiki markdown not just code blocks +urlhttp://www.enlightenment.org diff --git a/public_html/lib/plugins/codelink/syntax.php b/public_html/lib/plugins/codelink/syntax.php new file mode 100644 index 000..fbffdec --- /dev/null +++ b/public_html/lib/plugins/codelink/syntax.php @@ -0,0 +1,131 @@ +?php +/** + * DokuWiki Plugin codelink (Syntax Component) + * + * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html + * @author Carsten Haitzler ras...@rasterman.com + */ + +// must be run within Dokuwiki +if (!defined('DOKU_INC')) die(); + +class syntax_plugin_codelink extends DokuWiki_Syntax_Plugin { + +var $keydata = array(); +var $keylanguage; + +function load_lang_data($language) { +global $conf; +if (!empty($this-keydata[$language])) { +return; +} + +$extn_dir = $conf['datadir'] . '/' . $conf['code_extn']; +if (!file_exists($extn_dir)) { +$extn_dir = ''; +} +else { +$extn_link = $extn_dir . '/' . $language . '/keyword-link.txt'; +$extn_list = $extn_dir . '/' . $language . '/keyword-list.txt'; +if (file_exists($extn_link) file_exists($extn_list)) { +$link_array = file($extn_link, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); +$keys_array = file($extn_list, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); +$this-keydata[$language]['link'] = $link_array[0]; +$this-keydata[$language]['keys'] = $keys_array; +foreach ($keys_array as $k) { +$this-Lexer-addSpecialPattern($k . '()', 'base', 'plugin_codelink'); +$this-Lexer-addSpecialPattern($k, 'base', 'plugin_codelink'); +} +} +} +} +/** + * @return string Syntax mode type + */ +public function getType() { +return 'substition'; +} +/** + * @return string Paragraph type + */ +public function getPType() { +return 'normal'; +} +/** + * @return int Sort order - Low numbers go before high numbers + */ +public function getSort() { +return 999; +} + +/** + * Connect lookup pattern to lexer. + * + * @param string $mode Parser mode + */ +public function connectTo($mode) { +// FIXME: make this cleaner +// languages supported here
[EGIT] [website/www-content] master 01/02: wiki content - use new code lang declaration to use auto-linking
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1dfd7faeb099b292f6adc00ea94705d89c7fe335 commit 1dfd7faeb099b292f6adc00ea94705d89c7fe335 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 18:08:49 2015 +0900 wiki content - use new code lang declaration to use auto-linking also remove manual '' '' monispacing of tokens and let codelink do it. --- pages/docs/efl/ref/c/key/evas_object_del.txt | 11 ++- pages/docs/efl/ref/c/key/evas_object_ref.txt | 7 --- pages/docs/efl/start.txt | 25 ++--- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/pages/docs/efl/ref/c/key/evas_object_del.txt b/pages/docs/efl/ref/c/key/evas_object_del.txt index 73b7114..2cc5d2c 100644 --- a/pages/docs/efl/ref/c/key/evas_object_del.txt +++ b/pages/docs/efl/ref/c/key/evas_object_del.txt @@ -1,4 +1,5 @@ ~~Title: evas_object_del()~~ +~~CODE-c~~ code c void evas_object_del(Evas_Object *obj) /code @@ -12,18 +13,18 @@ collected by the rendering of the canvas. This will also hide the object, if it has been shown. Note that if the object has more references (created by -''evas_object_ref()'' and ''evas_object_unref()'' for example), then +evas_object_ref() and evas_object_unref() for example), then deletion will wait until all these references have been given up with -''evas_object_unref()''. +evas_object_unref(). If the object has no outstanding references, at this point the -''EVAS_CALLBACK_DEL'' callback will be called on this object, informing +EVAS_CALLBACK_DEL callback will be called on this object, informing all listeners of the callback of this deletion. At a later point when -the object is actually really cleaned up, the ''EVAS_CALLBACK_FREE'' +the object is actually really cleaned up, the EVAS_CALLBACK_FREE event callback will get called. If the object had the focus at the time of deletion, the -''EVAS_CALLBACK_FOCUS_OUT'' event callbacks will also be called at this +EVAS_CALLBACK_FOCUS_OUT event callbacks will also be called at this time. Note that all objects contained in an Evas canvas are deleted when the diff --git a/pages/docs/efl/ref/c/key/evas_object_ref.txt b/pages/docs/efl/ref/c/key/evas_object_ref.txt index 1def77f..3682f73 100644 --- a/pages/docs/efl/ref/c/key/evas_object_ref.txt +++ b/pages/docs/efl/ref/c/key/evas_object_ref.txt @@ -1,10 +1,11 @@ ~~Title: evas_object_ref()~~ +~~CODE-c~~ code c void evas_object_ref(Evas_Object *obj) /code This increments the reference count of the object ''obj'', which, if greater -than 0, will defer deletion by ''evas_object_del()'' until all references +than 0, will defer deletion by evas_object_del() until all references are released back (counter back to 0). References cannot go below 0 and unreferencing past that will result in the reference count being limited to 0. References are limited to //(2^32) -1// for an object. Referencing it @@ -15,8 +16,8 @@ instance, Evas is not ready to check for pending references on a canvas deletion, or things like that. This is useful in scenarios where, inside a code block, callbacks exist which would possibly delete an object we are operating on afterwards. Then, one would -''evas_object_ref()'' it at the beginning of the block and -''evas_object_unref()'' it at the end. It would then be deleted at +evas_object_ref() it at the beginning of the block and +evas_object_unref() it at the end. It would then be deleted at this point, if it should be. == Example == diff --git a/pages/docs/efl/start.txt b/pages/docs/efl/start.txt index 809c148..1aa9b5b 100644 --- a/pages/docs/efl/start.txt +++ b/pages/docs/efl/start.txt @@ -1,4 +1,5 @@ ~~Title: EFL~~ +~~CODE-c~~ EFL @@ -61,13 +62,15 @@ design pattern. An application would spend almost it's entire life inside the __Mainloop__ sleeping, processing events and then updating it's UI, until it decides to exit. All of this would take place inside the -__Mainloop__ processing function ''elm_run()'' which will only return -once the __Mainloop__ voluntarily exits if an ''elm_exit()'' function is +__Mainloop__ processing function elm_run() which will only return +once the __Mainloop__ voluntarily exits if an elm_exit() function is called while it runs, which marks the loop to exit, next time it has a chance. Before and after this, will be initialization and shutdown of the application. Your most basic application that just does nothing but wait forever for events would be: +elm_exit + code c example.c #include Elementary.h @@ -119,10 +122,10 @@ elm_main(int argc, char **argv) ELM_MAIN() /code -When the application runs, the ''ELM_MAIN()'' macro sets up a normal -''main()'' function, inits EFL for you and then calls elm_main() with +When the application runs, the ELM_MAIN() macro sets up a normal +main() function, inits EFL for you and then calls elm_main() with the usual
[EGIT] [website/www-content] master 01/01: efl docs - remove test line
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=d0d89a7bfa500210cb6e9290659b36bf05efbfe7 commit d0d89a7bfa500210cb6e9290659b36bf05efbfe7 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 24 18:13:57 2015 +0900 efl docs - remove test line --- pages/docs/efl/start.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/docs/efl/start.txt b/pages/docs/efl/start.txt index 1aa9b5b..a32419b 100644 --- a/pages/docs/efl/start.txt +++ b/pages/docs/efl/start.txt @@ -69,8 +69,6 @@ chance. Before and after this, will be initialization and shutdown of the application. Your most basic application that just does nothing but wait forever for events would be: -elm_exit - code c example.c #include Elementary.h --
[EGIT] [apps/rage] master 02/02: fix minor leak in rage on failed win creation
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=ca14bfa26485681be797a1e86fdee20fe48017c6 commit ca14bfa26485681be797a1e86fdee20fe48017c6 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sun Apr 26 12:23:56 2015 +0900 fix minor leak in rage on failed win creation fixes CID 61903 --- src/bin/win.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/win.c b/src/bin/win.c index 733a1d5..83dd798 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -332,7 +332,11 @@ win_add(void) if (!inf) return NULL; win = elm_win_add(NULL, Rage, ELM_WIN_BASIC); - if (!win) return NULL; + if (!win) + { +free(inf); +return NULL; + } elm_win_title_set(win, Rage); elm_win_autodel_set(win, EINA_TRUE); --
[EGIT] [apps/rage] master 02/02: rage - 0.1.4
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=4b4be341310c47e925acc515ec89aae4212c5723 commit 4b4be341310c47e925acc515ec89aae4212c5723 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue Apr 28 14:33:52 2015 +0900 rage - 0.1.4 --- Marrakesh.mrk | 2 +- README| 2 +- configure.ac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marrakesh.mrk b/Marrakesh.mrk index bbf043d..ca9a242 100644 --- a/Marrakesh.mrk +++ b/Marrakesh.mrk @@ -1,7 +1,7 @@ PROJ: Rage PROJICON: data/icons/rage.png BRIEF: A beautiful video media player -VERSION: 0.1.3 +VERSION: 0.1.4 LICENSE: BSD-2 COPYING: COPYING AUTHORS NEEDS: 1.13 diff --git a/README b/README index 19988e9..32153a4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Rage 0.1.3 +Rage 0.1.4 ** diff --git a/configure.ac b/configure.ac index 6873ee8..8f988be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([rage], [0.1.3], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([rage], [0.1.4], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) --
[EGIT] [website/www-content] master 01/01: efl docs - add some keywords
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ba2caa78ab6ea914461fb003eda86ad91cb8ca73 commit ba2caa78ab6ea914461fb003eda86ad91cb8ca73 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue Apr 28 20:58:58 2015 +0900 efl docs - add some keywords --- pages/docs/efl/ref/c/keyword-list.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/pages/docs/efl/ref/c/keyword-list.txt b/pages/docs/efl/ref/c/keyword-list.txt index db94134..bc84a39 100644 --- a/pages/docs/efl/ref/c/keyword-list.txt +++ b/pages/docs/efl/ref/c/keyword-list.txt @@ -1,3 +1,7 @@ +ecore_idler_add +ecore_idler_del +ecore_time_get +ecore_loop_time_get evas_object_del evas_object_ref evas_object_unref @@ -16,9 +20,11 @@ elm_win_resize_object_add elm_button_add elm_object_text_set Evas_Object +Ecore_Idler ELM_MAIN ELM_POLICY_QUIT ELM_POLICY_QUIT_LAST_WINDOW_CLOSED +EINA_FALSE EINA_TRUE EVAS_CALLBACK_DEL EVAS_CALLBACK_FREE --
[EGIT] [website/www] master 01/01: add soem more setup notes for www
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=f00db12432bd88fbaca581c66a2e4f8183528f44 commit f00db12432bd88fbaca581c66a2e4f8183528f44 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Apr 29 19:30:13 2015 +0900 add soem more setup notes for www --- README | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README b/README index de9a782..df34053 100644 --- a/README +++ b/README @@ -7,6 +7,12 @@ it can do php5 or better. You will want to: + sudo ln -s /path/to/www/public_html /srv/http + +(or whatever it needed to have the public_html directory here be the +base of your webserver dir). You may have to enable FollowSymLinks in +apache or ngix or whatever (read up webserver docs relevant to that). + cp local.php.sample public_html/conf/local.php and then modify $conf['datadir'] and $conf['mediadir'] to point to the @@ -22,9 +28,13 @@ The first time you run your local webserver and go there, you may get permission denied problems. You may have to either make your www tree owned by your http server, or run your webserver as you. You will get to set up an admin account the first time if all directories are -accessible correctly. You are now pretty much done. Enjoy your local -wiki install and save time by not having to comit changes to the wiki -before testing. +accessible correctly. Soyo may have to + + sudo chown -R http /path/to/www + sudo chown -R http /path/to/www-content + +You are now pretty much done. Enjoy your local wiki install and save +time by not having to comit changes to the wiki before testing. Note that we want to keep changes to the wiki tself at a minimum beyond: --
[EGIT] [website/www-content] master 02/02: Revert Wiki page start changed with summary [] by Philippe Caseiro
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=8e53c79d9875f1e0b10fcf14acc28ba872fed8e9 commit 8e53c79d9875f1e0b10fcf14acc28ba872fed8e9 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sun May 3 09:00:30 2015 +0900 Revert Wiki page start changed with summary [] by Philippe Caseiro This reverts commit 4542be71e6369ab8d9014abcbe9a1750503e558a. --- pages/start.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/pages/start.txt b/pages/start.txt index 33d2e64..bd2caf3 100644 --- a/pages/start.txt +++ b/pages/start.txt @@ -45,5 +45,3 @@ Even [[http://www.tizen.org|native Tizen applications]] use EFL for their develo {{:shot-edi.png?nolink240 }} This is by no means a complete list of applications, and we are not done making more. We may not have started the traditional way, but are building our library over time, and Tizen has another library brewing over there as well. - -Crazy french was here :p --
[EGIT] [website/www-content] master 01/01: syntax page - provide some visible syntax explanations
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0833e753db5b78557757f6d10070867a6a604cb4 commit 0833e753db5b78557757f6d10070867a6a604cb4 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon May 18 21:31:45 2015 +0900 syntax page - provide some visible syntax explanations --- pages/wiki/syntax.txt | 98 --- 1 file changed, 86 insertions(+), 12 deletions(-) diff --git a/pages/wiki/syntax.txt b/pages/wiki/syntax.txt index 45666e2..d426553 100644 --- a/pages/wiki/syntax.txt +++ b/pages/wiki/syntax.txt @@ -1,33 +1,107 @@ -~~Title: Example Page~~ -This will be some sample content. nothing more. +~~Title: Wiki Syntax~~ +A title like the title of this page: + +code +~~Title: Wiki Syntax~~ +/code + + +How to define what programming language the rest of the page will be +dealing with: + +code +~~CODE-c~~ +/code + + +A paragraph is simply text, on a single line or across multiple lines +until a blank line before/after the section of text. + +code +A paragraph is simply text, on a single line or across multiple lines +until a blank line before/after the section of text. +/code + + + +== Level 1 Headline == + +code == Level 1 Headline == +/code + + -Paragraph here += Level 2 Headline = +code = Level 2 Headline = +/code -Paragraph here + Level 3 Headline -Paragraph here +code + Level 3 Headline +/code + + === Level 4 Headline === -Paragraph here +code +=== Level 4 Headline === +/code + + == Level 5 Headline == -A horizontal rule goes below. +code +== Level 5 Headline == +/code + + + +A horizontal rule is like -This is the first paragraph of the page. We should test a long one to -see how wrapping and other formatting works with it. **Bold Text** -works. //Italic Text// also works. __Underlined Text__ is fine as -well. ''Monospaced Text'' is there too. delStrike-through Text/del -is also not a problem. +code + +/code + + + +Within text you can do **Bold Text**, //Italic Text//, __Underlined +Text__, and ''Monospaced Text'' as well as delStrike-through +Text/del. + +code +Withing text you can do **Bold Text**, //Italic Text//, __Underlined +Text__, and ''Monospaced Text'' as well as delStrike-through +Text/del. +/code + + + + + + + + + + + + + + + + + + - Ordered List Item - Item 2 --
[EGIT] [website/www-content] master 02/02: exmaple page - show off new plugins
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=8d6ab2f06d6c65e2533eadd9c64ddcdf6ff91e03 commit 8d6ab2f06d6c65e2533eadd9c64ddcdf6ff91e03 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Apr 16 13:48:09 2015 +0900 exmaple page - show off new plugins --- pages/example.txt | 77 +++ 1 file changed, 77 insertions(+) diff --git a/pages/example.txt b/pages/example.txt index f66a76f..1680ca0 100644 --- a/pages/example.txt +++ b/pages/example.txt @@ -93,5 +93,82 @@ Some text Yet another level +itemtable header=test;c=column_a;c=column_b,column_c;c=column_d;fdelim=: + +_line_a +column_a:text_a1 +column_b:tablecelltext_a2 \\ This is an example +how to fill a cell over several lines/tablecell + +_line_b +column_a:tablecelltext_b1 \\ \\ As you can see, local DokuWiki CRLF sequences +can be added to force a linebreak in the cell. Other formatting +elements could be used as well. +/tablecell +column_c:text_b2 + +/itemtable + +{| +|+//Extended Table Example// +! style=width: 12em;| +A1 Header +! style=width: 10em;| +B1 Header +|- style=background-color: #223344; +| +{{ icon-enlightenment.png?50nolink}} +Lorem ipsum dolor sit amet, +consetetur sadipscing elitr, +sed diam nonumy eirmod tempor invidunt +ut labore et dolore magna aliquyam erat, +sed diam voluptua. +| +B2 Data + * //italic// + * ''monospace'' + * [[:start|page link]] + +**ATTENTION:**\\ +Needs an extra empty line +after the end of whole table! +|} + + - Ordered list item 1 + - Ordered list item 2 + -- Ordered list item 3... + .. ... in multiple paragraphs + - Ordered list item 4 + + * Unordered list item + ** Unordered list item... + .. ... in multiple paragraphs + + - Ordered list, first level +- Second level + - Third level +- Fourth level +-- Back to second level + - //Second?! What happened to third?// +.. //Quiet, you.// + - Back to first level + - Still at first level + + ? Definition list + : Definition lists vary only slightly from other types of lists in that list items consist of two parts: a term and a description. The term is given by the DT element and is restricted to inline content. The description is given with a DD element that contains block-level content. [Source: W3C] + ? Definition list w/ multiple paragraphs + :: The style sheet provided with this plugin will render these paragraphs... + .. ... to the left of the term being defined. +? Definition list w/ multiple paragraphs +: Another way to separate blocks of text in a definition... +: ... is to simply have multiple definitions for a term (or group of terms). + + : This definition list has DD tags without any preceding DT tags. + : Hey, it's legal XHTML. + ? Just like DT tags without following DD tags. + ?? But DT tags can't contain paragraphs. That would __not__ be legal XHTML. + .. If you try, the result will be rendered oddly. + + ~~DISCUSSIONS~~ --
[EGIT] [website/www] master 02/02: www plugin - remove svgpureinsert - not needed if we just add mime
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=75d9a74cf5a8a8c0ac1ebde02bca1630f6fb4f81 commit 75d9a74cf5a8a8c0ac1ebde02bca1630f6fb4f81 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Apr 16 13:43:51 2015 +0900 www plugin - remove svgpureinsert - not needed if we just add mime what we really wanted is just adding svg to mimetypes allowed for images --- public_html/lib/plugins/svgpureinsert/.gitignore | 0 public_html/lib/plugins/svgpureinsert/.travis.yml | 13 - public_html/lib/plugins/svgpureinsert/README | 29 -- .../lib/plugins/svgpureinsert/_test/dokuwiki.svg | 541 - .../plugins/svgpureinsert/_test/general.test.php | 33 -- .../lib/plugins/svgpureinsert/_test/svglogo.svg| 50 -- .../plugins/svgpureinsert/_test/syntax.test.php| 52 -- public_html/lib/plugins/svgpureinsert/action.php | 32 -- .../lib/plugins/svgpureinsert/cache/.gitignore | 0 public_html/lib/plugins/svgpureinsert/helper.php | 149 -- .../lib/plugins/svgpureinsert/plugin.info.txt | 7 - public_html/lib/plugins/svgpureinsert/syntax.php | 124 - 12 files changed, 1030 deletions(-) diff --git a/public_html/lib/plugins/svgpureinsert/.gitignore b/public_html/lib/plugins/svgpureinsert/.gitignore deleted file mode 100644 index e69de29..000 diff --git a/public_html/lib/plugins/svgpureinsert/.travis.yml b/public_html/lib/plugins/svgpureinsert/.travis.yml deleted file mode 100644 index caf4cca..000 --- a/public_html/lib/plugins/svgpureinsert/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Config file for travis-ci.org - -language: php -php: - - 5.5 - - 5.4 - - 5.3 -env: - - DOKUWIKI=master - - DOKUWIKI=stable -before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh -install: sh travis.sh -script: cd _test phpunit --stderr --group plugin_svgpureinsert \ No newline at end of file diff --git a/public_html/lib/plugins/svgpureinsert/README b/public_html/lib/plugins/svgpureinsert/README deleted file mode 100644 index 89320e1..000 --- a/public_html/lib/plugins/svgpureinsert/README +++ /dev/null @@ -1,29 +0,0 @@ -svgpureinsert Plugin for DokuWiki - -Inserts an SVG image as-is into a DokuWiki page to be rendered by -compatible browsers. - -All documentation for this plugin can be found at -https://www.dokuwiki.org/plugin:svgpureinsert - -If you install this plugin manually, make sure it is installed in -lib/plugins/svgpureinsert/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - - -Copyright (C) Leszek Piątek lpia...@gmail.com, - Andreas Gohr g...@cosmocode.de - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg b/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg deleted file mode 100644 index eb4bbe9..000 --- a/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg +++ /dev/null @@ -1,541 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -!-- Created with Inkscape (http://www.inkscape.org/) -- -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://web.resource.org/cc/; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; - xmlns:sodipodi=http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=744.09448819 - height=1052.3622047 - id=svg2 - sodipodi:version=0.32 - inkscape:version=0.43 - sodipodi:docbase=/home/andi - sodipodi:docname=dokuwiki.svg - defs - id=defs4 -linearGradient - id=linearGradient2624 - stop - style=stop-color:#3a9030;stop-opacity:0.83673471; - offset=0 - id=stop2626 / - stop - style=stop-color:#3d9c32;stop-opacity:0.79591835; - offset=1 - id=stop2628 / -/linearGradient -linearGradient - id=linearGradient2612 - stop - style=stop-color:#25901b;stop-opacity:0.83673471; - offset=0 - id=stop2614 / - stop - style=stop-color:#25901b;stop-opacity:0.37755102; - offset=1 - id=stop2616 / -/linearGradient -linearGradient - id=linearGradient2600 - stop - style=stop-color:#e32525
[EGIT] [website/www-content] master 01/01: efl www - simplify doc dir tree a bit
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b78bbbe69a0ddf5043e8aec8cdd26d73c50018ea commit b78bbbe69a0ddf5043e8aec8cdd26d73c50018ea Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Apr 16 14:14:51 2015 +0900 efl www - simplify doc dir tree a bit --- media/docs/{lib = }/efl/mainloop.png | Bin media/docs/{lib = }/efl/mainloop.svg | 0 pages/docs.txt | 2 +- .../{ref/lib/efl/gen = efl/ref}/c/key/evas_object_del.txt | 0 .../{ref/lib/efl/gen = efl/ref}/c/key/evas_object_ref.txt | 0 pages/docs/efl/ref/c/keyword-link.txt | 1 + pages/docs/{ref/lib/efl/gen = efl/ref}/c/keyword-list.txt | 0 pages/docs/{lib = }/efl/start.txt | 3 ++- pages/docs/ref/lib/efl/gen/c/keyword-link.txt | 1 - 9 files changed, 4 insertions(+), 3 deletions(-) diff --git a/media/docs/lib/efl/mainloop.png b/media/docs/efl/mainloop.png similarity index 100% rename from media/docs/lib/efl/mainloop.png rename to media/docs/efl/mainloop.png diff --git a/media/docs/lib/efl/mainloop.svg b/media/docs/efl/mainloop.svg similarity index 100% rename from media/docs/lib/efl/mainloop.svg rename to media/docs/efl/mainloop.svg diff --git a/pages/docs.txt b/pages/docs.txt index c0bf090..e4506c1 100644 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -9,7 +9,7 @@ continually. This is also the case if you want to contribute. Of course you can use stable packages for your distribution as well. * [[docs-efl-start|Get EFL installed]] - * [[docs/lib/efl/start|Get started with EFL]] + * [[docs/efl/start|Get started with EFL]] diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt b/pages/docs/efl/ref/c/key/evas_object_del.txt similarity index 100% rename from pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt rename to pages/docs/efl/ref/c/key/evas_object_del.txt diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt b/pages/docs/efl/ref/c/key/evas_object_ref.txt similarity index 100% rename from pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt rename to pages/docs/efl/ref/c/key/evas_object_ref.txt diff --git a/pages/docs/efl/ref/c/keyword-link.txt b/pages/docs/efl/ref/c/keyword-link.txt new file mode 100644 index 000..a030b1a --- /dev/null +++ b/pages/docs/efl/ref/c/keyword-link.txt @@ -0,0 +1 @@ +/docs/efl/ref/c/key/{FNAMEL} diff --git a/pages/docs/ref/lib/efl/gen/c/keyword-list.txt b/pages/docs/efl/ref/c/keyword-list.txt similarity index 100% rename from pages/docs/ref/lib/efl/gen/c/keyword-list.txt rename to pages/docs/efl/ref/c/keyword-list.txt diff --git a/pages/docs/lib/efl/start.txt b/pages/docs/efl/start.txt similarity index 99% rename from pages/docs/lib/efl/start.txt rename to pages/docs/efl/start.txt index 41cbb8b..f5f05ef 100644 --- a/pages/docs/lib/efl/start.txt +++ b/pages/docs/efl/start.txt @@ -1,4 +1,5 @@ ~~Title: EFL~~ + EFL EFL is a range of libraries that cover APIs to solve every day @@ -55,7 +56,7 @@ struggling against EFL and what it is pushing you to use. This does not mean we do not support threads, we just push you into a specific design pattern. -{{ :docs:lib:efl:mainloop.svg?nolink |Application Mainloop}} +{{ :docs:efl:mainloop.svg?nolink |Application Mainloop}} An application would spend almost it's entire life inside the __Mainloop__ sleeping, processing events and then updating it's UI, diff --git a/pages/docs/ref/lib/efl/gen/c/keyword-link.txt b/pages/docs/ref/lib/efl/gen/c/keyword-link.txt deleted file mode 100644 index 4d6db0f..000 --- a/pages/docs/ref/lib/efl/gen/c/keyword-link.txt +++ /dev/null @@ -1 +0,0 @@ -/docs/ref/lib/efl/gen/c/key/{FNAMEL} --
[EGIT] [website/www] master 01/02: www - add folded plugin (it' doesn't work.. why? some js stuff)
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=2fd0513bdd2d50ab6c897ec095348f8f7cec7132 commit 2fd0513bdd2d50ab6c897ec095348f8f7cec7132 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 14:23:37 2015 +0900 www - add folded plugin (it' doesn't work.. why? some js stuff) --- public_html/lib/plugins/folded/action.php | 40 + public_html/lib/plugins/folded/closed.gif | Bin 0 - 53 bytes public_html/lib/plugins/folded/conf/default.php| 8 ++ public_html/lib/plugins/folded/conf/metadata.php | 8 ++ public_html/lib/plugins/folded/lang/cs/lang.php| 16 public_html/lib/plugins/folded/lang/da/lang.php| 11 +++ .../lib/plugins/folded/lang/da/settings.php| 9 ++ public_html/lib/plugins/folded/lang/de/lang.php| 16 .../lib/plugins/folded/lang/de/settings.php| 11 +++ public_html/lib/plugins/folded/lang/en/lang.php| 16 .../lib/plugins/folded/lang/en/settings.php| 11 +++ public_html/lib/plugins/folded/lang/eo/lang.php| 11 +++ .../lib/plugins/folded/lang/eo/settings.php| 9 ++ public_html/lib/plugins/folded/lang/es/lang.php| 16 public_html/lib/plugins/folded/lang/fr/lang.php| 12 +++ .../lib/plugins/folded/lang/fr/settings.php| 9 ++ public_html/lib/plugins/folded/lang/gl/lang.php| 18 public_html/lib/plugins/folded/lang/it/lang.php| 18 public_html/lib/plugins/folded/lang/ja/lang.php| 16 .../lib/plugins/folded/lang/ja/settings.php| 11 +++ public_html/lib/plugins/folded/lang/ko/lang.php| 12 +++ .../lib/plugins/folded/lang/ko/settings.php| 9 ++ public_html/lib/plugins/folded/lang/nl/lang.php| 11 +++ .../lib/plugins/folded/lang/nl/settings.php| 9 ++ public_html/lib/plugins/folded/lang/no/lang.php| 16 public_html/lib/plugins/folded/lang/pl/lang.php| 16 public_html/lib/plugins/folded/lang/pt-br/lang.php | 16 public_html/lib/plugins/folded/lang/ru/lang.php| 11 +++ .../lib/plugins/folded/lang/ru/settings.php| 9 ++ public_html/lib/plugins/folded/lang/sv/lang.php| 16 public_html/lib/plugins/folded/lang/th/lang.php| 16 public_html/lib/plugins/folded/lang/tr/lang.php| 16 public_html/lib/plugins/folded/lang/zh-tw/lang.php | 16 public_html/lib/plugins/folded/lang/zh/lang.php| 16 public_html/lib/plugins/folded/open.gif| Bin 0 - 51 bytes public_html/lib/plugins/folded/plugin.info.txt | 7 ++ public_html/lib/plugins/folded/script.js | 50 +++ public_html/lib/plugins/folded/style.css | 27 ++ public_html/lib/plugins/folded/syntax/div.php | 98 + public_html/lib/plugins/folded/syntax/span.php | 85 ++ 40 files changed, 722 insertions(+) diff --git a/public_html/lib/plugins/folded/action.php b/public_html/lib/plugins/folded/action.php new file mode 100644 index 000..3c3b097 --- /dev/null +++ b/public_html/lib/plugins/folded/action.php @@ -0,0 +1,40 @@ +?php +/** + * Folded plugin: enables folded text font size with syntax ++ text ++ + * + * @licenseGPL 2 (http://www.gnu.org/licenses/gpl.html) + * @author Michael Hamann mich...@content-space.de + */ +if(!defined('DOKU_INC')) die(); // no Dokuwiki, no go + +/** + * Action part: makes the show/hide strings available in the browser + */ +class action_plugin_folded extends DokuWiki_Action_Plugin { +/** + * Register the handle function in the controller + * + * @param Doku_event_handler $controller The event controller + */ +function register(Doku_Event_Handler $controller) { +$controller-register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'addhidereveal'); +} + +/** + * Add the hide and reveal strings to $JSINFO so it can be used in the javascript + * + * @param Doku_Event $event The event + * @param array $params The parameters for the event + */ +function addhidereveal($event, $params) { +global $JSINFO; + +$hide = $this-getConf('hide') ? $this-getConf('hide') : $this-getLang('hide'); +$reveal = $this-getConf('reveal') ? $this-getConf('reveal') : $this-getLang('reveal'); + +$JSINFO['plugin_folded'] = array( +'hide' = $hide, +'reveal' = $reveal +); +} +} diff --git a/public_html/lib/plugins/folded/closed.gif b/public_html/lib/plugins/folded/closed.gif new file mode 100644 index 000..c81c9ca Binary files /dev/null and b/public_html/lib/plugins/folded/closed.gif differ diff --git a/public_html/lib/plugins/folded/conf/default.php b/public_html/lib/plugins/folded/conf/default.php new file mode 100644 index 000..d129325 --- /dev/null +++ b/public_html/lib/plugins/folded/conf/default.php @@ -0,0 +1,8 @@ +?php +/* + * folded plugin, default
[EGIT] [website/www-content] master 01/01: example page - add folded section - doesn't unfold :(
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=29981042581f5dfc38fa24ca88c389daad63c97f commit 29981042581f5dfc38fa24ca88c389daad63c97f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 14:25:24 2015 +0900 example page - add folded section - doesn't unfold :( --- pages/example.txt | 14 ++ 1 file changed, 14 insertions(+) diff --git a/pages/example.txt b/pages/example.txt index 1680ca0..b774c23 100644 --- a/pages/example.txt +++ b/pages/example.txt @@ -169,6 +169,20 @@ after the end of whole table! ?? But DT tags can't contain paragraphs. That would __not__ be legal XHTML. .. If you try, the result will be rendered oddly. +And now to test a bunch of folded text/content below. But ++First | +test if we can fold/unfold inline++. Then try a block below: + + Folded block here | + +The content wouldbe here + +^ Table ^ Blah ^ Blah ^ +| Row | Row | Row| +| Your | Boat | Gently | +| Down | The | Stream | + + + ~~DISCUSSIONS~~ --
[EGIT] [website/www] master 02/02: clean up search box to be darker on www title
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=71de632912475b0ff054225f3a96839bb86e5771 commit 71de632912475b0ff054225f3a96839bb86e5771 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 14:24:43 2015 +0900 clean up search box to be darker on www title --- public_html/lib/tpl/e/css/modifications.css | 6 ++ 1 file changed, 6 insertions(+) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 5308b8d..6a2c23e 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -109,6 +109,7 @@ h1, h2, h3, h4, h5, h6, .navbar-inverse { border: 0px; + background-color: #282828; } .nav li a { @@ -289,6 +290,7 @@ padding: 10px; dt { padding-top: 10px; border-bottom: 0px; + color: #808080; } dd { @@ -423,3 +425,7 @@ div .comment_buttons { .pull-right { float: initial !important; } + +input#qsearch__in { + background-color: #101010; +} --
[EGIT] [website/www] master 01/01: WIKI CUSTOM - folded plugin - fix folding to work with simple class
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=43cddc1e133a0ccc41e3fd9fe3f7df1a5bb7f09f commit 43cddc1e133a0ccc41e3fd9fe3f7df1a5bb7f09f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 14:43:58 2015 +0900 WIKI CUSTOM - folded plugin - fix folding to work with simple class this fixes folding by not needing a dokuwiki parent as that simply doesn't seem to be there. --- public_html/lib/plugins/folded/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/lib/plugins/folded/script.js b/public_html/lib/plugins/folded/script.js index d553328..3930363 100644 --- a/public_html/lib/plugins/folded/script.js +++ b/public_html/lib/plugins/folded/script.js @@ -23,7 +23,7 @@ jQuery(function() { * toggle the folded element via className change also adjust the classname and * title tooltip on the folding link */ -jQuery('.dokuwiki .folder').click(function folded_toggle(evt) { +jQuery('.folder').click(function folded_toggle(evt) { var id = this.href.match(/(#.*)$/)[1]; var $id = jQuery(id); --
[EGIT] [website/www] master 05/05: Revert MINOR: Remove dist and example files
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=6db69ff62a44de5a069c8a2772112493bad5d133 commit 6db69ff62a44de5a069c8a2772112493bad5d133 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 09:57:31 2015 +0900 Revert MINOR: Remove dist and example files This reverts commit ea04fd391393db0815437e6f14d3dab9817e670d. --- public_html/.htaccess.dist | 35 + public_html/conf/acl.auth.php.dist | 21 +++ public_html/conf/local.php.dist | 16 ++ public_html/conf/mysql.conf.php.example | 253 public_html/conf/users.auth.php.dist| 10 ++ public_html/inc/preload.php.dist| 17 +++ 6 files changed, 352 insertions(+) diff --git a/public_html/.htaccess.dist b/public_html/.htaccess.dist new file mode 100644 index 000..5724a6e --- /dev/null +++ b/public_html/.htaccess.dist @@ -0,0 +1,35 @@ +## Enable this to restrict editing to logged in users only + +## You should disable Indexes and MultiViews either here or in the +## global config. Symlinks maybe needed for URL rewriting. +#Options -Indexes -MultiViews +FollowSymLinks + +## make sure nobody gets the htaccess, README, COPYING or VERSION files +Files ~ ^([\._]ht|README$|VERSION$|COPYING$) +Order allow,deny +Deny from all +/Files + +## Uncomment these rules if you want to have nice URLs using +## $conf['userewrite'] = 1 - not needed for rewrite mode 2 +#RewriteEngine on +# +#RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L] +#RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L] +#RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1id=$2 [QSA,L] +#RewriteRule ^$doku.php [L] +#RewriteCond %{REQUEST_FILENAME} !-f +#RewriteCond %{REQUEST_FILENAME} !-d +#RewriteRule (.*) doku.php?id=$1 [QSA,L] +#RewriteRule ^index.php$ doku.php +# +## Not all installations will require the following line. If you do, +## change /dokuwiki to the path to your dokuwiki directory relative +## to your document root. +#RewriteBase /dokuwiki +# +## If you enable DokuWikis XML-RPC interface, you should consider to +## restrict access to it over HTTPS only! Uncomment the following two +## rules if your server setup allows HTTPS. +#RewriteCond %{HTTPS} !=on +#RewriteRule ^lib/exe/xmlrpc.php$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R=301] diff --git a/public_html/conf/acl.auth.php.dist b/public_html/conf/acl.auth.php.dist new file mode 100644 index 000..14344d7 --- /dev/null +++ b/public_html/conf/acl.auth.php.dist @@ -0,0 +1,21 @@ +# acl.auth.php +# ?php exit()? +# Don't modify the lines above +# +# Access Control Lists +# +# Editing this file by hand shouldn't be necessary. Use the ACL +# Manager interface instead. +# +# If your auth backend allows special char like spaces in groups +# or user names you need to urlencode them (only chars 128, leave +# UTF-8 multibyte chars as is) +# +# none 0 +# read 1 +# edit 2 +# create 4 +# upload 8 +# delete 16 + +* @ALL8 diff --git a/public_html/conf/local.php.dist b/public_html/conf/local.php.dist new file mode 100644 index 000..0397954 --- /dev/null +++ b/public_html/conf/local.php.dist @@ -0,0 +1,16 @@ +?php +/** + * This is an example of how a local.php could look like. + * Simply copy the options you want to change from dokuwiki.php + * to this file and change them. + * + * When using the installer, a correct local.php file be generated for + * you automatically. + */ + + +//$conf['title'] = 'My Wiki';//what to show in the title + +//$conf['useacl'] = 1;//Use Access Control Lists to restrict access? +//$conf['superuser'] = 'joe'; + diff --git a/public_html/conf/mysql.conf.php.example b/public_html/conf/mysql.conf.php.example new file mode 100644 index 000..8337f51 --- /dev/null +++ b/public_html/conf/mysql.conf.php.example @@ -0,0 +1,253 @@ +?php +/* + * This is an example configuration for the mysql auth plugin. + * + * This SQL statements are optimized for following table structure. + * If you use a different one you have to change them accordingly. + * See comments of every statement for details. + * + * TABLE users + * uid login pass firstname lastname email + * + * TABLE groups + * gid name + * + * TABLE usergroup + * uid gid + * + * To use this configuration you have to copy them to local.protected.php + * or at least include this file in local.protected.php. + */ + +/* Options to configure database access. You need to set up this + * options carefully, otherwise you won't be able to access you + * database. + */ +$conf['plugin']['authmysql']['server'] = ''; +$conf['plugin']['authmysql']['user'] = ''; +$conf['plugin']['authmysql']['password'] = ''; +$conf['plugin']['authmysql']['database'] = ''; + +/* This option enables debug
[EGIT] [website/www] master 02/05: Revert MINOR: Import conf/local.php as we want to essence of that repo is to
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=24e870a38bc6c165d642ce08b9218bfce31129ce commit 24e870a38bc6c165d642ce08b9218bfce31129ce Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Apr 17 09:51:27 2015 +0900 Revert MINOR: Import conf/local.php as we want to essence of that repo is to This reverts commit 140dbb6435d1525386cbc0ccc6d39717ba2879c9. --- public_html/conf/local.php | 57 -- 1 file changed, 57 deletions(-) diff --git a/public_html/conf/local.php b/public_html/conf/local.php deleted file mode 100644 index ba813d6..000 --- a/public_html/conf/local.php +++ /dev/null @@ -1,57 +0,0 @@ -?php -/* - * Dokuwiki's Main Configuration File - Local Settings - */ - -$conf['title'] = ''; -$conf['template'] = 'e'; -$conf['license'] = '0'; -$conf['recent'] = 0; -$conf['recent_days'] = 0; -$conf['breadcrumbs'] = 0; -$conf['dformat'] = ''; -$conf['tocminheads'] = '20'; -$conf['maxtoclevel'] = '0'; -$conf['maxseclevel'] = '0'; -$conf['useheading'] = '1'; -$conf['useacl'] = 1; -$conf['passcrypt'] = 'sha512'; -$conf['superuser'] = '@admin'; -$conf['disableactions'] = 'recent,revisions'; -$conf['jpg_quality'] = 90; -$conf['subscribers'] = 1; -$conf['mailfrom'] = 'no-re...@enlightenment.org'; -$conf['mailprefix'] = 'Enlightenment'; -$conf['sitemap'] = 1; -$conf['updatecheck'] = 0; -$conf['userewrite'] = '1'; -$conf['useslash'] = 1; -$conf['compress'] = 0; -$conf['send404'] = 1; -$conf['compression'] = '0'; -$conf['plugin']['include']['showfooter'] = 0; -$conf['plugin']['include']['showdate'] = 0; -$conf['plugin']['include']['showuser'] = 0; -$conf['plugin']['include']['showcomments'] = 0; -$conf['plugin']['include']['showlinkbacks'] = 0; -$conf['plugin']['include']['showtags'] = 0; -$conf['plugin']['include']['showeditbtn'] = 0; -$conf['plugin']['include']['doredirect'] = 0; -$conf['plugin']['include']['doindent'] = 0; -$conf['plugin']['include']['parlink'] = 0; -$conf['plugin']['include']['safeindex'] = 0; -$conf['plugin']['include']['readmore'] = 0; -$conf['plugin']['captcha']['mode'] = 'audio'; -$conf['plugin']['captcha']['width'] = 300; -$conf['plugin']['captcha']['height'] = 100; -$conf['plugin']['discussion']['allowguests'] = 0; -$conf['plugin']['discussion']['urlfield'] = 1; -$conf['plugin']['discussion']['moderatorgroups'] = 'admin,edit'; -$conf['plugin']['gitbacked']['pushAfterCommit'] = 1; -$conf['plugin']['gitbacked']['periodicPull'] = 1; -$conf['plugin']['gitbacked']['periodicMinutes'] = 1; -$conf['plugin']['gitbacked']['repoPath'] = 'data/www-content'; -$conf['plugin']['gitbacked']['repoWorkDir'] = 'data/www-content/tmp'; -$conf['tpl']['dokui']['hide-entry-title'] = '1'; -$conf['datadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/pages'; -$conf['mediadir'] = $_SERVER['DOCUMENT_ROOT'] . '/data/www-content/media'; --
[EGIT] [website/www-content] master 01/01: fix typo in about
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1afe7616c4363deee874f7c85a0ac69ba71e3238 commit 1afe7616c4363deee874f7c85a0ac69ba71e3238 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Apr 15 13:48:49 2015 +0900 fix typo in about --- pages/about.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.txt b/pages/about.txt index 9f0135c..b70e0ed 100644 --- a/pages/about.txt +++ b/pages/about.txt @@ -30,7 +30,7 @@ the way, but we are not standing still, and one day will leave X11 behind. Of course Enlightenment is built on top of EFL, using the libraries we -wrong for it to do its UI as well as to run the entire compositor +wrote for it to do its UI as well as to run the entire compositor itself. This means that any improvements to EFL turn up in the compositor as well. --
[EGIT] [website/www] master 01/01: www nav - make sure all nav links are absolute so they work in subdirs
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=a15d233eb324c93909db4d6e78ac1f77f7fc7701 commit a15d233eb324c93909db4d6e78ac1f77f7fc7701 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Apr 15 13:53:18 2015 +0900 www nav - make sure all nav links are absolute so they work in subdirs --- public_html/lib/tpl/e/nav.html | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public_html/lib/tpl/e/nav.html b/public_html/lib/tpl/e/nav.html index 70970f1..b6f941d 100644 --- a/public_html/lib/tpl/e/nav.html +++ b/public_html/lib/tpl/e/nav.html @@ -1,8 +1,8 @@ -lia href=startMain/a/li -lia href=aboutAbout/a/li -lia href=downloadDownload/a/li -lia href=contactContact/a/li -lia href=docsDocs/a/li +lia href=/startMain/a/li +lia href=/aboutAbout/a/li +lia href=/downloadDownload/a/li +lia href=/contactContact/a/li +lia href=/docsDocs/a/li lia href=https://phab.enlightenment.org/phame/live/3;News/a/li lia href=https://phab.enlightenment.org/phame/live/1;Blog/a/li lia href=https://phab.enlightenment.org/;Devel/a/li --
[EGIT] [website/www] master 01/01: www - dt - remove line at bottom in css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=fc684881053801a7dafecabe5f71c00dd4e5bad1 commit fc684881053801a7dafecabe5f71c00dd4e5bad1 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Apr 15 18:16:45 2015 +0900 www - dt - remove line at bottom in css --- public_html/lib/tpl/e/css/modifications.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index c77c8f2..c42dd65 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -288,7 +288,7 @@ padding: 10px; dt { padding-top: 10px; - border-bottom: 1px solid #606060; + border-bottom: 0px; } dd { --
[EGIT] [website/www-content] master 01/01: add content for wiki note plugin - css and images
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=298641d2b8bd1f1bd4a0430fdfd127ad4893 commit 298641d2b8bd1f1bd4a0430fdfd127ad4893 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jun 24 12:59:55 2015 +0900 add content for wiki note plugin - css and images --- media/note-classic.png | Bin 0 - 331 bytes media/note-classic.svg | 74 ++ media/note-important.png | Bin 0 - 730 bytes media/note-important.svg | 90 +++ media/note-tip.png | Bin 0 - 651 bytes media/note-tip.svg | 85 media/note-warning.png | Bin 0 - 674 bytes media/note-warning.svg | 79 + pages/wiki/syntax.txt| 46 +++- 9 files changed, 373 insertions(+), 1 deletion(-) diff --git a/media/note-classic.png b/media/note-classic.png new file mode 100644 index 000..10534b7 Binary files /dev/null and b/media/note-classic.png differ diff --git a/media/note-classic.svg b/media/note-classic.svg new file mode 100644 index 000..1a2d9bf --- /dev/null +++ b/media/note-classic.svg @@ -0,0 +1,74 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=48 + height=48 + viewBox=0 0 48 48 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=note-classic.svg + inkscape:export-filename=/home/raster/C/wc/media/note-classic.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#404040 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=25.58 + inkscape:cx=24 + inkscape:cy=24 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:showpageshadow=false + inkscape:window-width=1833 + inkscape:window-height=1364 + inkscape:window-x=3435 + inkscape:window-y=547 + inkscape:window-maximized=0 +inkscape:grid + type=xygrid + id=grid4136 + units=px + spacingx=1 + spacingy=1 / + /sodipodi:namedview + metadata + id=metadata7 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + g + inkscape:label=Layer 1 + inkscape:groupmode=layer + id=layer1 + transform=translate(0,-1004.3622) +path + style=fill:#ff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1 + d=m 25,1050.3622 -2,-19 -8,0 0,-4 5,0 -1,-17 -4,0 0,-4 20,0 0,4 -4,0 -1,17 5,0 0,4 -8,0 z + id=path4138 + inkscape:connector-curvature=0 / + /g +/svg diff --git a/media/note-important.png b/media/note-important.png new file mode 100644 index 000..b41fd18 Binary files /dev/null and b/media/note-important.png differ diff --git a/media/note-important.svg b/media/note-important.svg new file mode 100644 index 000..20cc08a --- /dev/null +++ b/media/note-important.svg @@ -0,0 +1,90 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=48 + height=48 + viewBox=0 0 48 48 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=note-important.svg + inkscape:export-filename=/home/raster/C/wc/media/note-important.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#404040 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=25.58 + inkscape:cx=24 + inkscape:cy=24 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:showpageshadow=false + inkscape:window-width=1833
[EGIT] [website/www] master 01/01: wiki plugin - add note plugin as requested
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=09f5f33d00a76d67411a9175f3a740188e84a058 commit 09f5f33d00a76d67411a9175f3a740188e84a058 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jun 24 13:00:23 2015 +0900 wiki plugin - add note plugin as requested --- public_html/lib/plugins/note/.gitignore| 1 + public_html/lib/plugins/note/images/important.png | Bin 0 - 2250 bytes public_html/lib/plugins/note/images/note.png | Bin 0 - 2520 bytes .../lib/plugins/note/images/tb_important.png | Bin 0 - 1366 bytes public_html/lib/plugins/note/images/tb_note.png| Bin 0 - 1461 bytes public_html/lib/plugins/note/images/tb_tip.png | Bin 0 - 1441 bytes public_html/lib/plugins/note/images/tb_warning.png | Bin 0 - 1870 bytes public_html/lib/plugins/note/images/tip.png| Bin 0 - 2909 bytes public_html/lib/plugins/note/images/warning.png| Bin 0 - 3249 bytes public_html/lib/plugins/note/info.txt | 8 + public_html/lib/plugins/note/script.js | 36 public_html/lib/plugins/note/style.css | 41 + public_html/lib/plugins/note/syntax.php| 191 + public_html/lib/tpl/e/css/modifications.css| 40 + 14 files changed, 317 insertions(+) diff --git a/public_html/lib/plugins/note/.gitignore b/public_html/lib/plugins/note/.gitignore new file mode 100644 index 000..f3c7a7c --- /dev/null +++ b/public_html/lib/plugins/note/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/public_html/lib/plugins/note/images/important.png b/public_html/lib/plugins/note/images/important.png new file mode 100644 index 000..dc8c8a4 Binary files /dev/null and b/public_html/lib/plugins/note/images/important.png differ diff --git a/public_html/lib/plugins/note/images/note.png b/public_html/lib/plugins/note/images/note.png new file mode 100644 index 000..df1e0a9 Binary files /dev/null and b/public_html/lib/plugins/note/images/note.png differ diff --git a/public_html/lib/plugins/note/images/tb_important.png b/public_html/lib/plugins/note/images/tb_important.png new file mode 100644 index 000..d853518 Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_important.png differ diff --git a/public_html/lib/plugins/note/images/tb_note.png b/public_html/lib/plugins/note/images/tb_note.png new file mode 100644 index 000..f5c9316 Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_note.png differ diff --git a/public_html/lib/plugins/note/images/tb_tip.png b/public_html/lib/plugins/note/images/tb_tip.png new file mode 100644 index 000..f127e91 Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_tip.png differ diff --git a/public_html/lib/plugins/note/images/tb_warning.png b/public_html/lib/plugins/note/images/tb_warning.png new file mode 100644 index 000..892c833 Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_warning.png differ diff --git a/public_html/lib/plugins/note/images/tip.png b/public_html/lib/plugins/note/images/tip.png new file mode 100644 index 000..2000f20 Binary files /dev/null and b/public_html/lib/plugins/note/images/tip.png differ diff --git a/public_html/lib/plugins/note/images/warning.png b/public_html/lib/plugins/note/images/warning.png new file mode 100644 index 000..3c8a37d Binary files /dev/null and b/public_html/lib/plugins/note/images/warning.png differ diff --git a/public_html/lib/plugins/note/info.txt b/public_html/lib/plugins/note/info.txt new file mode 100644 index 000..5226345 --- /dev/null +++ b/public_html/lib/plugins/note/info.txt @@ -0,0 +1,8 @@ +# General Plugin Info do not edit + +author Olivier Cortès / Eric Hameleers / Christopher Smith / Aurélien Bompard +email ol...@deep-ocean.net +date 2009-06-15 +name Note Plugin +desc Add Note/Important/Tip/Warning Capability (DIV+CSS box) +urlhttp://www.dokuwiki.org/plugin:note diff --git a/public_html/lib/plugins/note/script.js b/public_html/lib/plugins/note/script.js new file mode 100644 index 000..c211207 --- /dev/null +++ b/public_html/lib/plugins/note/script.js @@ -0,0 +1,36 @@ +/* Add Note buttons to the toolbar */ +/* from http://wiki.splitbrain.org/wiki:tips:toolbarbutton */ + +/* Disabled because this does not allow to select a text and turn it into a note like the type:format does +var notes_arr = new Array(); // key = insertion string , value = icon filename. +notes_arr['note/note\\n']='tb_note.png'; +notes_arr['note tip/note\\n']='tb_tip.png'; +notes_arr['note important/note\\n']='tb_important.png'; +notes_arr['note warning/note\\n']='tb_warning.png'; + +toolbar[toolbar.length] = {type:picker, + title:Notes, + icon:../../plugins/note/images/tb_note.png, + key:, + list: notes_arr, + icobase:../plugins
[EGIT] [website/www-content] master 01/02: remove background from memory map diagram
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b3261901c9937230c0c3780a2d767a6d5d7e546d commit b3261901c9937230c0c3780a2d767a6d5d7e546d Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jun 18 13:42:45 2015 +0900 remove background from memory map diagram --- media/docs/c/memory.svg | 17 - 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/media/docs/c/memory.svg b/media/docs/c/memory.svg index 8f64c00..b1d110c 100644 --- a/media/docs/c/memory.svg +++ b/media/docs/c/memory.svg @@ -1746,7 +1746,7 @@ inkscape:pageopacity=0 inkscape:pageshadow=2 inkscape:zoom=1 - inkscape:cx=186.57259 + inkscape:cx=-21.92741 inkscape:cy=464.7489 inkscape:document-units=px inkscape:current-layer=layer1 @@ -1767,7 +1767,7 @@ inkscape:snap-nodes=true inkscape:window-width=1423 inkscape:window-height=2092 - inkscape:window-x=4337 + inkscape:window-x=3133 inkscape:window-y=0 inkscape:window-maximized=0 inkscape:grid @@ -1800,15 +1800,6 @@ inkscape:groupmode=layer id=layer1 transform=translate(0,-112.36216) -rect - style=color:#00;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#00;solid-opacity:1;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#282828;stroke-width:0.99921262;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto; [...] - id=rect49247 - width=360 - height=940 - x=0 - y=112.36216 - rx=1.7382799e-05 - ry=1.7382799e-05 / text xml:space=preserve style=font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:100%;font-family:Elegante;-inkscape-font-specification:Elegante;letter-spacing:0px;word-spacing:0px;fill:#ff9933;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 @@ -2518,7 +2509,7 @@ height=58.380001 x=37.52 y=30.09 //flowRegionflowPara - id=flowPara14435/flowPara/flowRootpath + id=flowPara14435 //flowRootpath style=fill:none;fill-rule:evenodd;stroke:#ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker14455-0) d=m 117.26956,398.0361 75.06,0 0,-9.174 id=path6988-4 @@ -4133,7 +4124,7 @@ sodipodi:role=line id=tspan48962 x=67.229561 - y=931.79614/tspan/text + y=931.79614 //text path style=fill:none;fill-rule:evenodd;stroke:#ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 d=m 96.419571,143.66614 -8.34,4.17 0,37.53 8.34,4.17 --
[EGIT] [website/www-content] master 02/02: fix alignment of charcter in mem map
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ffec3179bfe37120e9c56f4cf9382b59d99874ca commit ffec3179bfe37120e9c56f4cf9382b59d99874ca Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jun 18 13:45:38 2015 +0900 fix alignment of charcter in mem map --- media/docs/c/memory.svg | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media/docs/c/memory.svg b/media/docs/c/memory.svg index b1d110c..15844c1 100644 --- a/media/docs/c/memory.svg +++ b/media/docs/c/memory.svg @@ -1745,9 +1745,9 @@ borderopacity=1.0 inkscape:pageopacity=0 inkscape:pageshadow=2 - inkscape:zoom=1 - inkscape:cx=-21.92741 - inkscape:cy=464.7489 + inkscape:zoom=16 + inkscape:cx=225.19537 + inkscape:cy=794.44401 inkscape:document-units=px inkscape:current-layer=layer1 showgrid=true @@ -1765,9 +1765,9 @@ inkscape:object-paths=true inkscape:snap-global=true inkscape:snap-nodes=true - inkscape:window-width=1423 + inkscape:window-width=1420 inkscape:window-height=2092 - inkscape:window-x=3133 + inkscape:window-x=3126 inkscape:window-y=0 inkscape:window-maximized=0 inkscape:grid @@ -1781,7 +1781,7 @@ color=#ff0099 opacity=0.39215686 empspacing=5 - enabled=false / + enabled=true / /sodipodi:namedview metadata id=metadata7 @@ -2306,13 +2306,13 @@ text xml:space=preserve style=font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.5px;line-height:100%;font-family:Elegante;-inkscape-font-specification:Elegante;letter-spacing:0px;word-spacing:0px;fill:#00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 - x=219.43456 + x=221.52568 y=252.08612 id=text7524-82-4-2 sodipodi:linespacing=100%tspan sodipodi:role=line id=tspan7526-2-5-9 - x=219.43456 + x=221.52568 y=252.08612 style=font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Courier New';-inkscape-font-specification:'Courier New';fill:#ffo/tspan/text text --
[EGIT] [website/www-content] master 01/01: add memory heap and stack layout diagram
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1f9cb561467847c3778809521c970e55e11a889f commit 1f9cb561467847c3778809521c970e55e11a889f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jun 18 14:52:52 2015 +0900 add memory heap and stack layout diagram --- media/docs/c/memheapstack.svg | 1855 + 1 file changed, 1855 insertions(+) diff --git a/media/docs/c/memheapstack.svg b/media/docs/c/memheapstack.svg new file mode 100644 index 000..ab12d59 --- /dev/null +++ b/media/docs/c/memheapstack.svg @@ -0,0 +1,1855 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=360 + height=940 + viewBox=0 0 360 940 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=memheapstack.svg + defs + id=defs4 +marker + inkscape:stockid=Arrow2Mend + orient=auto + refY=0 + refX=0 + id=marker21714 + style=overflow:visible + inkscape:isstock=true + path + id=path21716 + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1 + d=M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z + transform=scale(-0.6,-0.6) + inkscape:connector-curvature=0 / +/marker +marker + inkscape:stockid=Arrow2Mend + orient=auto + refY=0 + refX=0 + id=marker7588 + style=overflow:visible + inkscape:isstock=true + path + id=path7590 + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1 + d=M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z + transform=scale(-0.6,-0.6) + inkscape:connector-curvature=0 / +/marker +marker + inkscape:isstock=true + style=overflow:visible + id=marker7410 + refX=0 + refY=0 + orient=auto + inkscape:stockid=Arrow2Mend + path + transform=scale(-0.6,-0.6) + d=M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1 + id=path7412 + inkscape:connector-curvature=0 / +/marker +marker + inkscape:isstock=true + style=overflow:visible + id=marker7326 + refX=0 + refY=0 + orient=auto + inkscape:stockid=Arrow1Lend + path + transform=matrix(-0.8,0,0,-0.8,-10,0) + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:1pt;stroke-opacity:1 + d=M 0,0 5,-5 -12.5,0 5,5 0,0 Z + id=path7328 + inkscape:connector-curvature=0 / +/marker +marker + inkscape:isstock=true + style=overflow:visible + id=marker7298 + refX=0 + refY=0 + orient=auto + inkscape:stockid=Arrow1Lend + path + transform=matrix(-0.8,0,0,-0.8,-10,0) + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:1pt;stroke-opacity:1 + d=M 0,0 5,-5 -12.5,0 5,5 0,0 Z + id=path7300 + inkscape:connector-curvature=0 / +/marker +marker + inkscape:isstock=true + style=overflow:visible + id=marker7276 + refX=0 + refY=0 + orient=auto + inkscape:stockid=Arrow1Lend + path + transform=matrix(-0.8,0,0,-0.8,-10,0) + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:1pt;stroke-opacity:1 + d=M 0,0 5,-5 -12.5,0 5,5 0,0 Z + id=path7278 + inkscape:connector-curvature=0 / +/marker +marker + inkscape:stockid=Arrow2Mend + orient=auto + refY=0 + refX=0 + id=marker7588-2 + style=overflow:visible + inkscape:isstock=true + path + inkscape:connector-curvature=0 + id=path7590-5 + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:#ff;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1 + d=M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e
[EGIT] [website/www-content] master 01/01: add shortcut svg's
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e1f8d0848078ea23f84d80ec0cb352b0eac4a3e2 commit e1f8d0848078ea23f84d80ec0cb352b0eac4a3e2 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 3 14:12:22 2015 +0900 add shortcut svg's --- media/scut-facebook.svg | 81 media/scut-flattr.svg | 162 media/scut-gplus.svg| 109 media/scut-paypal.svg | 92 +++ media/scut-twitter.svg | 70 + media/scut-youtube.svg | 81 6 files changed, 595 insertions(+) diff --git a/media/scut-facebook.svg b/media/scut-facebook.svg new file mode 100644 index 000..6ec6438 --- /dev/null +++ b/media/scut-facebook.svg @@ -0,0 +1,81 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=32 + height=32 + viewBox=0 0 32 32 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=scut-facebook.svg + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#303030 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=32.71875 + inkscape:cx=16 + inkscape:cy=16 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:window-width=1616 + inkscape:window-height=1408 + inkscape:window-x=2138 + inkscape:window-y=204 + inkscape:window-maximized=0 + inkscape:snap-smooth-nodes=true + inkscape:object-nodes=true + inkscape:object-paths=true + inkscape:snap-intersection-paths=true +inkscape:grid + type=xygrid + id=grid4155 + units=px + spacingx=1 + spacingy=1 / + /sodipodi:namedview + metadata + id=metadata7 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + g + inkscape:label=Layer 1 + inkscape:groupmode=layer + id=layer1 + transform=translate(0,-1020.3622) +path + style=fill:#4862a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 + d=m 4,1026.3622 c 0,-1 1,-2 2,-2 l 20,0 c 1,0 2,1 2,2 l 0,20 c 0,1 -1,2 -2,2 l -20,0 c -1,0 -2,-1 -2,-2 z + id=path4284 + inkscape:connector-curvature=0 + sodipodi:nodetypes=c / +path + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 + d=m 17,1048.3622 0,-10 -3,0 0,-3 3,0 0,-4 c 0,-2 1,-3 3,-3 l 4,0 0,3 -2,0 c -2,0 -2,0 -2,2 l 0,2 3,0 0,3 -3,0 0,10 z + id=path4286 + inkscape:connector-curvature=0 + sodipodi:nodetypes=c / + /g +/svg diff --git a/media/scut-flattr.svg b/media/scut-flattr.svg new file mode 100644 index 000..6d07e07 --- /dev/null +++ b/media/scut-flattr.svg @@ -0,0 +1,162 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=119 + height=32 + viewBox=0 0 119 32 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=scut-flattr.svg + defs + id=defs4 +linearGradient + inkscape:collect=always + id=linearGradient4511 + stop + style=stop-color:#fcc022;stop-opacity:1 + offset=0 + id=stop4513 / + stop + style=stop-color:#db6b27;stop-opacity:1 + offset=1 + id=stop4515 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient4503 + stop + style=stop-color:#b1b43e;stop-opacity:1 + offset=0 + id=stop4505 / + stop + style=stop-color:#7fa92c;stop-opacity:1 + offset=1 + id=stop4507 / +/linearGradient
[EGIT] [website/www] master 01/01: add svg mini www logo
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=e97af286639d6eb3a80e13e3ad7eafd27fc9f833 commit e97af286639d6eb3a80e13e3ad7eafd27fc9f833 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 3 15:05:17 2015 +0900 add svg mini www logo --- public_html/lib/tpl/e/css/modifications.css | 2 +- public_html/lib/tpl/e/images/logo.svg | 201 2 files changed, 202 insertions(+), 1 deletion(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 66329ad..5bb8f41 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -103,7 +103,7 @@ h1, h2, h3, h4, h5, h6, .navbar-header { width: 40px; height: 40px; - background: url(/lib/tpl/e/images/logo.png); + background: url(/lib/tpl/e/images/logo.svg); margin-top: 6px; } diff --git a/public_html/lib/tpl/e/images/logo.svg b/public_html/lib/tpl/e/images/logo.svg new file mode 100644 index 000..85e4efb --- /dev/null +++ b/public_html/lib/tpl/e/images/logo.svg @@ -0,0 +1,201 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Sodipodi (http://www.sodipodi.com/;) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + id=svg559 + sodipodi:version=0.33 + width=40 + height=40 + sodipodi:docname=logo.svg + version=1.1 + inkscape:version=0.91 r13725 + metadata + id=metadata31 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + defs + id=defs561 +linearGradient + id=linearGradient564 + stop + style=stop-color:#000;stop-opacity:1; + offset=0 + id=stop565 / + stop + style=stop-color:#fff;stop-opacity:1; + offset=1 + id=stop566 / +/linearGradient +linearGradient + xlink:href=#linearGradient564 + id=linearGradient567 / +radialGradient + xlink:href=#linearGradient564 + id=radialGradient568 + cx=0.5 + cy=0.5 + r=0.5 + fx=0.5 + fy=0.5 / +radialGradient + xlink:href=#linearGradient564 + id=radialGradient620 / + /defs + sodipodi:namedview + id=base + snaptogrid=true + showgrid=true + gridtolerance=5.00px + snaptoguides=false + bordercolor=#00 + borderopacity=0.32941176 + pagecolor=#303030 + inkscape:pageopacity=0 + inkscape:zoom=39.075 + inkscape:cx=20 + inkscape:cy=20 + inkscape:window-width=2148 + inkscape:window-height=1699 + inkscape:window-x=2235 + inkscape:window-y=197 + inkscape:window-maximized=0 + inkscape:current-layer=svg559 + inkscape:snap-bbox=true + inkscape:bbox-nodes=true + units=px / + g + id=g600 + style=fill:#ff;fill-opacity:1;stroke:none;stroke-opacity:1 + transform=matrix(0.06118251,0,0,0.06118251,-3.4131531,-10.56717) +path + style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1 + d=m 253.0964,451.5499 298.0828,199.0175 c 12.3337,-12.8429 12.3337,-12.8429 20.2182,-24.6206 67.0184,-100.1107 43.7081,-243.6352 -62.1011,-314.0059 -106.1899,-71.5505 -247.7678,-38.4091 -315.2532,61.7845 -64.5802,97.0834 -49.1298,239.61 62.3976,315.1319 97.5272,64.4282 188.9762,36.1043 245.0135,5.0054 L 473.477,645.883 C 413.0772,677.728 342.3128,681.5232 287.7821,644.4234 203.9245,588.8802 187.4273,479.7646 239.093,403.3519 c 50.833,-76.6977 156.0308,-100.0815 239.2262,-45.138 8 [...] + id=path582 + sodipodi:nodetypes= + inkscape:connector-curvature=0 / +path + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 + d=m 381.9484,173.6221 c -4.4291,44.2913 -10.6299,72.6377 -28.3464,79.7244 17.7165,-1.7717 19.4882,-1.7717 28.3464,-1.7717 8.8583,0 10.63,0 28.3465,1.7717 -17.7165,-7.0867 -23.9173,-35.4331 -28.3465,-79.7244 z + id=path578 + sodipodi:nodetypes=c + inkscape:connector-curvature=0 / +path + style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1 + d=m 314.5494,180.6657 c 4.8241,44.2501 4.618,73.266 -11.2504,83.8626 16.9673,-5.3964 18.7008,-5.7627 27.3676,-7.5942 8.6669,-1.8315 10.4003
[EGIT] [website/www-content] master 01/01: e logo - make svg right size
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=270ec6f6d7ae5e5bbee02a7269b9435d8683871b commit 270ec6f6d7ae5e5bbee02a7269b9435d8683871b Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 3 15:10:35 2015 +0900 e logo - make svg right size --- media/e-logo-title.png | Bin 61122 - 9072 bytes media/e-logo-title.svg | 22 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media/e-logo-title.png b/media/e-logo-title.png index ca748be..f977408 100644 Binary files a/media/e-logo-title.png and b/media/e-logo-title.png differ diff --git a/media/e-logo-title.svg b/media/e-logo-title.svg index 755c404..04658e4 100644 --- a/media/e-logo-title.svg +++ b/media/e-logo-title.svg @@ -12,8 +12,8 @@ xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; id=svg559 sodipodi:version=0.33 - width=482 - height=652 + width=200 + height=200 sodipodi:docname=e-logo-title.svg version=1.1 inkscape:version=0.91 r13725 @@ -67,14 +67,14 @@ borderopacity=0.32941176 pagecolor=#303030 inkscape:pageopacity=0 - inkscape:zoom=3.0076687 - inkscape:cx=241 - inkscape:cy=326 - inkscape:window-width=3840 - inkscape:window-height=2097 - inkscape:window-x=1920 - inkscape:window-y=0 - inkscape:window-maximized=1 + inkscape:zoom=6.015 + inkscape:cx=100 + inkscape:cy=100 + inkscape:window-width=1772 + inkscape:window-height=1357 + inkscape:window-x=2322 + inkscape:window-y=638 + inkscape:window-maximized=0 inkscape:current-layer=svg559 inkscape:snap-bbox=true inkscape:bbox-nodes=true @@ -82,7 +82,7 @@ g id=g600 style=fill:#ff;fill-opacity:1;stroke:none;stroke-opacity:1 - transform=translate(-141.7323,-173.59046) + transform=matrix(0.30604808,0,0,0.30604808,-17.117621,-52.903547) path style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1 d=m 253.0964,451.5499 298.0828,199.0175 c 12.3337,-12.8429 12.3337,-12.8429 20.2182,-24.6206 67.0184,-100.1107 43.7081,-243.6352 -62.1011,-314.0059 -106.1899,-71.5505 -247.7678,-38.4091 -315.2532,61.7845 -64.5802,97.0834 -49.1298,239.61 62.3976,315.1319 97.5272,64.4282 188.9762,36.1043 245.0135,5.0054 L 473.477,645.883 C 413.0772,677.728 342.3128,681.5232 287.7821,644.4234 203.9245,588.8802 187.4273,479.7646 239.093,403.3519 c 50.833,-76.6977 156.0308,-100.0815 239.2262,-45.138 8 [...] --
[EGIT] [website/www-content] master 01/01: www os logos - make image less wide
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0eb4c05434a72e5c7881e8d9442d99c68b69ba4f commit 0eb4c05434a72e5c7881e8d9442d99c68b69ba4f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri May 22 15:38:26 2015 +0900 www os logos - make image less wide --- media/os-logos.png | Bin 7911 - 8217 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/os-logos.png b/media/os-logos.png index 4e691a4..d3cd9fa 100644 Binary files a/media/os-logos.png and b/media/os-logos.png differ --
[EGIT] [website/www-content] master 01/01: edi - new logo for www
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3c48c2bf1b05a36d7ff554c2bb31bbca7c064f44 commit 3c48c2bf1b05a36d7ff554c2bb31bbca7c064f44 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon May 25 22:25:13 2015 +0900 edi - new logo for www --- media/edi-logo.png | Bin 10526 - 26396 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/edi-logo.png b/media/edi-logo.png index 1eea203..f4e2fbf 100644 Binary files a/media/edi-logo.png and b/media/edi-logo.png differ --
[EGIT] [apps/rage] master 01/01: use blank focus style for input catcher button widget
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=b0d6d61b24874f40fda0553e56efa1f9c1b40437 commit b0d6d61b24874f40fda0553e56efa1f9c1b40437 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon Aug 17 10:50:05 2015 +0900 use blank focus style for input catcher button widget --- src/bin/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/win.c b/src/bin/win.c index 4e768e2..4b95e9f 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -410,6 +410,7 @@ win_add(void) dnd_init(win, o); o = elm_button_add(win); + elm_object_focus_move_policy_set(o, ELM_FOCUS_MOVE_POLICY_CLICK); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, o); evas_object_color_set(o, 0, 0, 0, 0); @@ -424,6 +425,7 @@ win_add(void) // a dummy button to collect key events and have focus o = elm_button_add(win); + elm_object_focus_highlight_style_set(o, blank); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, o); evas_object_lower(o); --
[EGIT] [core/evas_generic_loaders] master 01/01: generic loaders - fix load if process esits before stdout produced
raster pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=100c1423234fc1802491c11e4d12f1cb30594f18 commit 100c1423234fc1802491c11e4d12f1cb30594f18 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue Aug 11 21:34:48 2015 +0900 generic loaders - fix load if process esits before stdout produced i found that generic loaders broke on my machine. stdout was never reaching the app. child process exited and never sent stdout before parent got anything - it all was lost in buffers somewhere. this fixes it. fflush stdout. nasty little bugger. @fix --- src/bin/gst/main.c | 2 +- src/bin/gst/main_0_10.c | 2 +- src/bin/pdf/main.cpp| 2 +- src/bin/ps/main.c | 2 +- src/bin/raw/main.c | 1 + src/bin/svg/main.c | 1 + src/bin/xcf/main.c | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/gst/main.c b/src/bin/gst/main.c index 77f3910..d9e6fa7 100644 --- a/src/bin/gst/main.c +++ b/src/bin/gst/main.c @@ -287,6 +287,6 @@ main(int argc, char **argv) printf(done\n); _gst_shutdown(); - + fflush(stdout); return 0; } diff --git a/src/bin/gst/main_0_10.c b/src/bin/gst/main_0_10.c index c6e4dd0..3e0c02b 100644 --- a/src/bin/gst/main_0_10.c +++ b/src/bin/gst/main_0_10.c @@ -273,6 +273,6 @@ main(int argc, char **argv) printf(done\n); _gst_shutdown(); - + fflush(stdout); return 0; } diff --git a/src/bin/pdf/main.cpp b/src/bin/pdf/main.cpp index 78f918e..d2cf856 100644 --- a/src/bin/pdf/main.cpp +++ b/src/bin/pdf/main.cpp @@ -350,6 +350,6 @@ main(int argc, char **argv) eina_tmpstr_del(tmpdir); eina_tmpstr_del(generated); } - + fflush(stdout); return 0; } diff --git a/src/bin/ps/main.c b/src/bin/ps/main.c index a994ec2..92c29a7 100644 --- a/src/bin/ps/main.c +++ b/src/bin/ps/main.c @@ -284,6 +284,6 @@ main(int argc, char **argv) printf(done\n); _spectre_shutdown(); - + fflush(stdout); return 0; } diff --git a/src/bin/raw/main.c b/src/bin/raw/main.c index 2e36119..bceb9ff 100644 --- a/src/bin/raw/main.c +++ b/src/bin/raw/main.c @@ -235,6 +235,7 @@ int main(int argc, char **argv) } } _raw_shutdown(); + fflush(stdout); return 0; } diff --git a/src/bin/svg/main.c b/src/bin/svg/main.c index b6c844c..5fc7912 100644 --- a/src/bin/svg/main.c +++ b/src/bin/svg/main.c @@ -223,6 +223,7 @@ int main(int argc, char **argv) } } _svg_shutdown(); + fflush(stdout); return 0; } diff --git a/src/bin/xcf/main.c b/src/bin/xcf/main.c index 48f2751..7b798ca 100644 --- a/src/bin/xcf/main.c +++ b/src/bin/xcf/main.c @@ -1726,5 +1726,6 @@ main(int argc, char **argv) else printf(done\n); xcf_cleanup(); + fflush(stdout); return 0; } --
[EGIT] [admin/devs] master 01/01: devs - andreas wants his commit access back. restore it with new keys
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a90ed6a097a0956b0ed317a32f876067175d79b9 commit a90ed6a097a0956b0ed317a32f876067175d79b9 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 7 08:52:24 2015 +0900 devs - andreas wants his commit access back. restore it with new keys --- {inactive = developers}/andreas/icon-big.png | Bin {inactive = developers}/andreas/icon-map.png | Bin {inactive = developers}/andreas/icon-med.png | Bin {inactive = developers}/andreas/icon-sml.png | Bin developers/andreas/id_dsa_lenovix.pub | 1 + developers/andreas/id_dsa_thor.pub| 1 + {inactive = developers}/andreas/info.txt | 0 inactive/andreas/id_dsa.pub | 1 - inactive/andreas/id_dsa_er00923n.pub | 1 - inactive/andreas/id_dsa_tuxedo.pub| 1 - 10 files changed, 2 insertions(+), 3 deletions(-) diff --git a/inactive/andreas/icon-big.png b/developers/andreas/icon-big.png similarity index 100% rename from inactive/andreas/icon-big.png rename to developers/andreas/icon-big.png diff --git a/inactive/andreas/icon-map.png b/developers/andreas/icon-map.png similarity index 100% rename from inactive/andreas/icon-map.png rename to developers/andreas/icon-map.png diff --git a/inactive/andreas/icon-med.png b/developers/andreas/icon-med.png similarity index 100% rename from inactive/andreas/icon-med.png rename to developers/andreas/icon-med.png diff --git a/inactive/andreas/icon-sml.png b/developers/andreas/icon-sml.png similarity index 100% rename from inactive/andreas/icon-sml.png rename to developers/andreas/icon-sml.png diff --git a/developers/andreas/id_dsa_lenovix.pub b/developers/andreas/id_dsa_lenovix.pub new file mode 100644 index 000..d3bff4f --- /dev/null +++ b/developers/andreas/id_dsa_lenovix.pub @@ -0,0 +1 @@ +ssh-dss B3NzaC1kc3MAAACBAJJUWcMTqdSXijfeveXrDJ4xGwn0W6wr9HMnQZJdttC8PglQy/zEcjFDGWrd/iF1JoDMlxc2gTea0YRvf7ha9+MDqsYuHYjgQUVxSu+4B6mtB4tKSkuwOKDQYb5TFBsvIkLkfzyROYElo0Ir4kcR7f02vxYb9eYsiLlwXQweTu99FQDsvo1xuWMt9xeQrWUl+iLnSBuhnwAAAIBx/YDP3qYo1ZjHBpoZRBAci24FWwXMFLAG0zYIt0mTMF6VwbeZ3exad7c06AaMJR6Mput/ZLIeve0SQ1wG+WPj3j9BVTnp1E3v8GQoS8heLMWuEv6HQLI91gM6orxoqfCUFFv7O3yDT2pa1o9qyJJJq5+UoQ8fT06+PyYer/GufwAAAIAFaD9gMYWNx0HDuAjO7NpS6pQxIJv8lgR/EfctnRqbVm4JACJgW/X+AahGxAFtU7kV874dBVB7bhEN [...] diff --git a/developers/andreas/id_dsa_thor.pub b/developers/andreas/id_dsa_thor.pub new file mode 100644 index 000..4891ca3 --- /dev/null +++ b/developers/andreas/id_dsa_thor.pub @@ -0,0 +1 @@ +ssh-dss B3NzaC1kc3MAAACBAKnJdC5SU4K7+C911LEhb8A2CqWuGWwj55uCMBkfm6H8LfRU+TUYGEBAYrYaaGkXVJ9bSY1c9NPk0PVthv/O3uBWbX0kCUxwYS5uRCHmH2LfWqw2mlkXk4gAz8BbeFv5iW4dFgBfkrdJFokwkxA/PprzavVn7hhSrZaTSyUKF3jVFQDpo024ED1YYnqSrNcHnM6A+tWAUwAAAIBZSd1tdMT7F72I9eX2oX5fCJAht9jwcSCdzg5AHTM0QStrwWrZZYNSSorwWQFGH4dVp7nT/w/nHyOOGGfzL+CebyDzoNUIUG2TmZ2jC5ht35un68fAWRgYIoSvr1j03Sgrg/x7Fl2qAO6x8P1mzNobLujTAvDdrDA6vbF1Hum7lwAAAIEAi1f89UcHlQeBR8oV4F6tSOcemuJ30t3/C3EJtMOXmXJYBUYoHhFnJZ/G/kr65fqT8FBbn7Ep1WCt [...] diff --git a/inactive/andreas/info.txt b/developers/andreas/info.txt similarity index 100% rename from inactive/andreas/info.txt rename to developers/andreas/info.txt diff --git a/inactive/andreas/id_dsa.pub b/inactive/andreas/id_dsa.pub deleted file mode 100644 index 4596ac3..000 --- a/inactive/andreas/id_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAOIIeVJNSw99ftTTFAjhUxMEax9Xbl7OTLZj0SHItDMuJ6VJuHvbSzZYdi8I/s+APT2lNoyOkX2zNBBJ69vCNoToEhnlmyeFjqlAEWw8GVwQw/lmAJfMZxzNXq0SVWRktpZNBDz2TZqPya8ZtHvozOkn0h7QbwNt/KfaVDJPqVSdFQCcE/d8YpBI0FPSHuJ5wSaRmnF5GQAAAIEAuhmVZIctLfV3w4CxGK2pOID+cGDruJ9puoa3yG6spjW3vjFte/EtHZ0jj5/10im8Wk0SNYp+HhGg9kWaJMhOfhhxRfkSFaNRrQA+3q0xLhWzwdHoFznt9dwbLM6/89EvC2+KW8Z3bG7MfBbpDljfbVvElbRlUPcdTs/b/XjX8VkAAACBAINv0jDJBjFqbINAxMqJ1KMN44PNjd9TldOK8kI+ImW79GVJxv+86oUKbG+zvaNt+KyyblzuVt5R [...] diff --git a/inactive/andreas/id_dsa_er00923n.pub b/inactive/andreas/id_dsa_er00923n.pub deleted file mode 100644 index cabf60c..000 --- a/inactive/andreas/id_dsa_er00923n.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAOFl5JXTDv6qOksBfv9RIYemOtTWLDY0abQShEO0IfY5J62bpCB5ZiWxRsVOkego+m2XDKwvhz5mxCbLJyXKqqpUQjZMOuhDyGYpvCh0yftzcED1RlHKDXN6B2E+EB4Al6vwh2xwVKdgfi9Csa1gnwDOnoozDt5ABQvNyPt6X8DvFQDkqduzp2e2/1yvs2RrDcqX3YLSJQAAAIEAq1VeCmtx8AiCsSufVfMiyOeSxyXlOSPTWI/2bB0tVe8HXcIEesO0OxbfRZDfN85ejupNA7AaydNI/LbtlCdDxC0jOFzTh5NQxfSVLSVfVnwf0AQHpQcU10M4eAhIOeHPyE8EnY60RFSCu7BPoguJWfGadpffQEXqIbAhMr4mR1sAAACAG4KCR4aoPYkkXm8HZusP9CfgF8KVpT0rh0tbGkPhTg6gVyVxxDU/xv3T/nRIIc+CPgUpVJF10fmt [...] diff --git a/inactive/andreas/id_dsa_tuxedo.pub b/inactive/andreas/id_dsa_tuxedo.pub deleted file mode 100644 index 800ffe0..000 --- a/inactive/andreas/id_dsa_tuxedo.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAIqu8TW3BBs+nWbIhCAFoQJEsyUQKBMkVbPQ91bXKpSkmA4FbuD9nx2Pz/NYkW1FJXOy1Sy9ZsRIKMaNmqFs/essb7Qr7fA7WLN5i+85I2
[EGIT] [website/www] master 01/01: www - add 2 plugins - youtube and html5video
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=72e8602ad6589a990ce114130481c496ba4f644c commit 72e8602ad6589a990ce114130481c496ba4f644c Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon Jul 13 12:06:19 2015 +0900 www - add 2 plugins - youtube and html5video --- public_html/.htaccess | 7 + public_html/conf/mime.local.conf | 3 + public_html/lib/plugins/html5video/README | 27 public_html/lib/plugins/html5video/TODO| 3 + public_html/lib/plugins/html5video/plugin.info.txt | 7 + .../lib/plugins/html5video/syntax/video.php| 145 + public_html/lib/plugins/youtube/img/youtube.png| Bin 0 - 1443 bytes public_html/lib/plugins/youtube/object.htm | 4 + public_html/lib/plugins/youtube/style.css | 7 + public_html/lib/plugins/youtube/syntax.php | 83 10 files changed, 286 insertions(+) diff --git a/public_html/.htaccess b/public_html/.htaccess index 4233b3d..b0956f5 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -13,3 +13,10 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule (.*) doku.php?id=$1 [QSA,L] RewriteRule ^index.php$ doku.php + +AddType application/webm webm +AddType video/webmwebm +AddType application/ogg ogv +AddType video/ogg ogv +AddType application/mp4 mp4 +AddType video/mp4 mp4 diff --git a/public_html/conf/mime.local.conf b/public_html/conf/mime.local.conf index febd3f1..2a2f6e1 100644 --- a/public_html/conf/mime.local.conf +++ b/public_html/conf/mime.local.conf @@ -1 +1,4 @@ svg image/svg+xml +webmvideo/webm +ogv video/ogg +mp4 video/mp4 diff --git a/public_html/lib/plugins/html5video/README b/public_html/lib/plugins/html5video/README new file mode 100644 index 000..fb34421 --- /dev/null +++ b/public_html/lib/plugins/html5video/README @@ -0,0 +1,27 @@ +html5video Plugin for DokuWiki + +Embeds video using HTML5 syntax + +All documentation for this plugin can be found at +http://www.dokuwiki.org/plugin:html5video + +If you install this plugin manually, make sure it is installed in +lib/plugins/html5video/ - if the folder is called different it +will not work! + +Please refer to http://www.dokuwiki.org/plugins for additional info +on how to install plugins in DokuWiki. + + +Copyright (C) Jason van Gumster (Fweeb) ja...@monsterjavaguns.com + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +See the COPYING file in your DokuWiki folder for details diff --git a/public_html/lib/plugins/html5video/TODO b/public_html/lib/plugins/html5video/TODO new file mode 100644 index 000..a19b17b --- /dev/null +++ b/public_html/lib/plugins/html5video/TODO @@ -0,0 +1,3 @@ +* Allow for graceful fallback to other web video formats for different browsers + +* Might be a good idea to use a stylesheet instead of inline styles for alignment diff --git a/public_html/lib/plugins/html5video/plugin.info.txt b/public_html/lib/plugins/html5video/plugin.info.txt new file mode 100644 index 000..985eb4d --- /dev/null +++ b/public_html/lib/plugins/html5video/plugin.info.txt @@ -0,0 +1,7 @@ +base html5video +author Jason van Gumster (Fweeb) +email ja...@monsterjavaguns.com +date 2013-03-07 +name html5video plugin +desc Embeds video using HTML5 syntax +urlhttp://www.dokuwiki.org/plugin:html5video diff --git a/public_html/lib/plugins/html5video/syntax/video.php b/public_html/lib/plugins/html5video/syntax/video.php new file mode 100644 index 000..ff78300 --- /dev/null +++ b/public_html/lib/plugins/html5video/syntax/video.php @@ -0,0 +1,145 @@ +?php +/** + * DokuWiki Plugin html5video (Syntax Component) + * + * @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html + * @author Jason van Gumster (Fweeb) ja...@monsterjavaguns.com + * + * Parts borrowed from the videogg plugin written by Ludovic Kiefer, + * which is based on Christophe Benz' Dailymotion plugin, which, in turn, + * is based on Ikuo Obataya's Youtube plugin. Whew... + * + * Currently only supports webm videos + */ + +// must be run within Dokuwiki +if (!defined('DOKU_INC')) die(); + +if (!defined('DOKU_LF')) define('DOKU_LF', \n); +if (!defined('DOKU_TAB')) define('DOKU_TAB', \t); +if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); + +require_once DOKU_PLUGIN.'syntax.php'; + +class syntax_plugin_html5video_video extends DokuWiki_Syntax_Plugin
[EGIT] [website/www] master 01/01: www - remove youtube, add vshare plugin
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=249573146b00786cc5d7d9b08b6624cdaa5524b7 commit 249573146b00786cc5d7d9b08b6624cdaa5524b7 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon Jul 13 12:20:03 2015 +0900 www - remove youtube, add vshare plugin yotube plugin broken - try vshare --- .../README | 25 +++ .../all.css| 20 ++ .../button.png | Bin 0 - 710 bytes .../lang/en/lang.php | 6 + .../lang/fr/lang.php | 10 + .../lang/ja/lang.php | 10 + .../lang/ko/lang.php | 10 + .../lang/nl/lang.php | 10 + .../pdf.css| 16 ++ .../plugin.info.txt| 8 + .../redir.php | 22 +++ .../script.js | 116 .../sites.conf | 26 +++ .../sites.js | 31 +++ .../syntax.php | 209 + .../video.png | Bin 0 - 6682 bytes public_html/lib/plugins/youtube/img/youtube.png| Bin 1443 - 0 bytes public_html/lib/plugins/youtube/object.htm | 4 - public_html/lib/plugins/youtube/style.css | 7 - public_html/lib/plugins/youtube/syntax.php | 83 20 files changed, 519 insertions(+), 94 deletions(-) diff --git a/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/README b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/README new file mode 100644 index 000..8859d5b --- /dev/null +++ b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/README @@ -0,0 +1,25 @@ +vshare Plugin for DokuWiki + +All documentation for this plugin can be found at +http://www.dokuwiki.org/plugin:vshare + +If you install this plugin manually, make sure it is installed in +lib/plugins/vshare/ - if the folder is called different it +will not work! + +Please refer to http://www.dokuwiki.org/plugins for additional info +on how to install plugins in DokuWiki. + + +Copyright (C) Andreas Gohr a...@splitbrain.org + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +See the COPYING file in your DokuWiki folder for details diff --git a/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/all.css b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/all.css new file mode 100644 index 000..380ac82 --- /dev/null +++ b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/all.css @@ -0,0 +1,20 @@ +iframe.vshare__left, +div.vshare__left { +float: left; +margin-right: 1em; +} + +iframe.vshare__right, +div.vshare__right { +float: right; +margin-left: 1em; +} + +iframe.vshare__center, +div.vshare__center { +text-align: center; +margin-left: auto; +margin-right: auto; +display: block; +} + diff --git a/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/button.png b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/button.png new file mode 100644 index 000..d050afa Binary files /dev/null and b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/button.png differ diff --git a/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/lang/en/lang.php b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/lang/en/lang.php new file mode 100644 index 000..2b968c6 --- /dev/null +++ b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/lang/en/lang.php @@ -0,0 +1,6 @@ +?php + +$lang['js']['button'] = 'Insert video from video sharing sites'; +$lang['js']['prompt'] = 'Please paste the full URL to the video page here:'; +$lang['js']['notfound'] = Sorry, this URL wasn't recognized.\nPlease refer to the documentation on how to insert the correct syntax manually.; + diff --git a/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/lang/fr/lang.php b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin-vshare-2522ed8/lang/fr/lang.php new file mode 100644 index 000..11176a8 --- /dev/null +++ b/public_html/lib/plugins/vshare/splitbrain-dokuwiki-plugin
[EGIT] [website/www] master 01/01: www - add an edje file share infra like screenshots
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=f934133a344d85125d321bde485012fd02d03da6 commit f934133a344d85125d321bde485012fd02d03da6 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Oct 28 14:53:22 2015 +0900 www - add an edje file share infra like screenshots --- public_html/edjshare.php | 87 1 file changed, 87 insertions(+) diff --git a/public_html/edjshare.php b/public_html/edjshare.php new file mode 100644 index 000..0c59aa3 --- /dev/null +++ b/public_html/edjshare.php @@ -0,0 +1,87 @@ +http://www.enlightenment.org/edjshare/; . $dest; + +if (!file_exists($thumb) || !file_exists($meta) || +!rename($thumb, $_SERVER["DOCUMENT_ROOT"] . "/edjshare/th-" . $dest . ".png")) +{ +unlink($temp); +unlink($thumb); +unlink($temp_ip); +unlink($meta); +header("HTTP/1.1 400 Bad Request"); +if (!file_exists($thumb)) echo "No Thumb"; +else if (!file_exists($meta)) echo "No meta"; +else echo "Invalid File Format"; +ob_end_flush(); +die(); +} + +rename($temp, $_SERVER["DOCUMENT_ROOT"] . "/edjshare/" . $dest . ".edj"); +rename($temp_ip, $_SERVER["DOCUMENT_ROOT"] . "/edjshare/ip-" . $dest); +file_put_contents($_SERVER["DOCUMENT_ROOT"] . "/edjshare/index.txt", + $dest . " " . $meta_data . "\n", FILE_APPEND | LOCK_EX); +unlink($meta); + + respond! +header("HTTP/1.1 200 OK"); +header("Content-Type: text/plain"); +header("X-Enlightenment-Service: Pants On"); +print $loc; +ob_end_flush(); +?> --
[EGIT] [website/www] master 01/01: edjshare - make png thumb the same name as edj file uploaded
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=234157b34a8e628ef680fcc13aade394e1642e7f commit 234157b34a8e628ef680fcc13aade394e1642e7f Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Fri Nov 13 15:10:17 2015 +0900 edjshare - make png thumb the same name as edj file uploaded --- public_html/edjshare.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public_html/edjshare.php b/public_html/edjshare.php index 0c59aa3..248710e 100644 --- a/public_html/edjshare.php +++ b/public_html/edjshare.php @@ -27,7 +27,7 @@ if ($edj_match != $edj_magic) { get a unique name $dest = uniqid("e-", true); $temp= $_SERVER["DOCUMENT_ROOT"] . "/edjshare/tmp/" . $dest . ".edj"; -$thumb = $_SERVER["DOCUMENT_ROOT"] . "/edjshare/tmp/th-" . $dest . ".png"; +$thumb = $_SERVER["DOCUMENT_ROOT"] . "/edjshare/tmp/" . $dest . ".png"; $temp_ip = $_SERVER["DOCUMENT_ROOT"] . "/edjshare/tmp/ip-" . $dest; $meta= $_SERVER["DOCUMENT_ROOT"] . "/edjshare/tmp/meta-" . $dest . ".meta"; @@ -58,7 +58,7 @@ fclose($fh); $loc = "http://www.enlightenment.org/edjshare/; . $dest; if (!file_exists($thumb) || !file_exists($meta) || -!rename($thumb, $_SERVER["DOCUMENT_ROOT"] . "/edjshare/th-" . $dest . ".png")) +!rename($thumb, $_SERVER["DOCUMENT_ROOT"] . "/edjshare/" . $dest . ".png")) { unlink($temp); unlink($thumb); --
[EGIT] [apps/rage] master 01/01: rage browser - improve looksa and layout to use file posters if possible
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=622cba151e63c9fd5f6b3531b0def17d9a88973c commit 622cba151e63c9fd5f6b3531b0def17d9a88973c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Thu Nov 12 22:23:21 2015 +0900 rage browser - improve looksa and layout to use file posters if possible 1. guess if it's a move by aspectr ratio and lenght. 2. if it meets this - search for a file poster online instead of generating thumbnails. 3. make thumbs now taller than wide to accomodate poster sizes looks nicer now. --- data/themes/default.edc| 40 ++- data/themes/images/Makefile.mk | 1 + data/themes/images/dimmer.png | Bin 0 -> 1360 bytes src/bin/albumart.c | 12 src/bin/albumart.h | 1 + src/bin/browser.c | 4 +- src/bin/thumb.c| 156 - src/bin/videothumb.c | 30 +++- src/bin/win.c | 4 +- 9 files changed, 124 insertions(+), 124 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 8ba5c1c..534b182 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -2147,8 +2147,7 @@ collections { group { name: "rage/browser/item"; images.image: "win_shadow.png" COMP; images.image: "win_glow.png" COMP; - images.image: "bg_shine.png" COMP; - images.image: "bg_glint.png" COMP; + images.image: "dimmer.png" COMP; parts { part { name: "shadow"; mouse_events: 0; @@ -2209,13 +2208,6 @@ collections { rel2.offset: -5 -5; } } - part { name: "glintclip"; type: RECT; -description { state: "default" 0.0; - rel1.to: "clip"; - rel2.to: "clip"; - rel1.offset: 0 -10; -} - } part { name: "rage.content"; type: SWALLOW; clip_to: "clip"; description { state: "default" 0.0; @@ -2223,35 +2215,13 @@ collections { rel2.to: "clip"; } } - part { name: "shine"; mouse_events: 0; + part { name: "dimmer"; mouse_events: 0; clip_to: "clip"; description { state: "default" 0.0; - image.normal: "bg_shine.png"; + image.normal: "dimmer.png"; fill.smooth: 0; rel1.to: "clip"; rel2.to: "clip"; - align: 0.5 0.0; - aspect: (255/120) (255/120); - aspect_preference: HORIZONTAL; -} - } - part { name: "glint"; mouse_events: 0; -clip_to: "glintclip"; -description { state: "default" 0.0; - fixed: 1 1; - min: 79 5; - max: 79 5; - rel1 { - relative: 0.0 0.0; - offset: 0 0; - to: "clip"; - } - rel2 { - relative: 1.0 0.0; - offset: -1 0; - to: "clip"; - } - image.normal: "bg_glint.png"; } } part { name: "rage.title"; type: TEXT; mouse_events: 0; @@ -2259,8 +2229,8 @@ collections { description { state: "default" 0.0; fixed: 1 1; align: 0.0 1.0; - rel1.offset: 4 4; - rel2.offset: -5 -5; + rel1.offset: 8 8; + rel2.offset: -9 -9; color: 255 255 255 255; text { font: "Sans"; size: 12; align: 0.0 1.0; diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk index f29153e..7205cd3 100644 --- a/data/themes/images/Makefile.mk +++ b/data/themes/images/Makefile.mk @@ -3,6 +3,7 @@ data/themes/images/bevel_dark_out.png \ data/themes/images/bg_bevel.png \ data/themes/images/bg_glint.png \ data/themes/images/bg_shine.png \ +data/themes/images/dimmer.png \ data/themes/images/glow_exclam.png \ data/themes/images/icon_arrow_right.png \ data/themes/images/icon_close2.png \ diff --git a/data/themes/images/dimmer.png b/data/themes/images/dimmer.png new file mode 100644 index 000..2f424fd Binary files /dev/null and b/data/themes/images/dimmer.png differ diff --git a/src/bin/albumart.c b/src/bin/albumart.c index 9faf4fa..e04abb2 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -16,6 +16,7 @@ static Ecore_Event_Handler *handle_complete = NULL; static Eina_Strbuf *sb_result = NULL; static
[EGIT] [apps/rage] master 01/01: rage - finish off improving browser
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=f9c47fb5214c06256db799ab4f2a3f4d64056dfe commit f9c47fb5214c06256db799ab4f2a3f4d64056dfe Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 14 00:02:22 2015 +0900 rage - finish off improving browser --- src/bin/albumart.c | 7 ++- src/bin/browser.c| 4 ++-- src/bin/thumb.c | 29 - src/bin/videothumb.c | 10 +++--- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/bin/albumart.c b/src/bin/albumart.c index e04abb2..6331058 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -117,9 +117,6 @@ _cb_http_complete(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { ecore_file_unlink(fetchpath); } -free(fetchpath); -fetchpath = NULL; -if (_fetch_done) _fetch_done(_fetch_data); } else { @@ -195,9 +192,9 @@ _cb_http_complete(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) fetchfile = NULL; } if (_fetch_done) _fetch_done(_fetch_data); +_fetch_done = NULL; +_fetch_data = NULL; } - _fetch_done = NULL; - _fetch_data = NULL; return EINA_FALSE; } diff --git a/src/bin/browser.c b/src/bin/browser.c index fbd22e3..07a2c79 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -58,8 +58,8 @@ _item_size_get(Evas_Object *win, Evas_Coord *w, Evas_Coord *h) elm_coords_finger_size_adjust(1, , 1, ); evas_object_geometry_get(win, NULL, NULL, w, h); - *w = *w / 15; - *h = *h / 5; + *w = *w / 8; + *h = *h / 3; if (*w < sz) *w = sz; if (*h < sz) *h = sz; } diff --git a/src/bin/thumb.c b/src/bin/thumb.c index 630380b..0009e1f 100644 --- a/src/bin/thumb.c +++ b/src/bin/thumb.c @@ -17,6 +17,16 @@ static const char *file = NULL; static void _cb_fetched(void *data EINA_UNUSED) { + char *path = albumart_file_get(file); + if (path) + { +Evas_Object *im = evas_object_image_add(evas_object_evas_get(win)); +int w, h; +evas_object_image_file_set(im, path, NULL); +evas_object_image_size_get(im, , ); +if ((w < 1) || (h < 0)) ecore_file_unlink(path); +free(path); + } elm_exit(); } @@ -25,6 +35,9 @@ _cb_loaded(void *data, Evas_Object *obj, void *info EINA_UNUSED) { const char *file, *title, *artist, *album; + if (vid_timeout) ecore_timer_del(vid_timeout); + vid_timeout = NULL; + file = data; title = emotion_object_meta_info_get(obj, EMOTION_META_INFO_TRACK_TITLE); artist = emotion_object_meta_info_get(obj, EMOTION_META_INFO_TRACK_ARTIST); @@ -49,7 +62,6 @@ _cb_loaded(void *data, Evas_Object *obj, void *info EINA_UNUSED) emotion_object_size_get(obj, , ); if (ratio > 0.0) iw = (ih * ratio); else ratio = iw / ih; -printf("ratio: %1.3f len: %1.1f\n", ratio, len); if ((ratio >= (4.0 / 3.0)) && (ratio <= (3.0 / 1.0)) && (len >= (75.0 * 60.0)) && @@ -67,7 +79,7 @@ _cb_loaded(void *data, Evas_Object *obj, void *info EINA_UNUSED) { char buf_base[PATH_MAX]; char buf_file[PATH_MAX]; -unsigned int pos, incr; +unsigned int pos; vidimage = evas_object_image_filled_add(evas_object_evas_get(subwin)); evas_object_show(vidimage); @@ -100,7 +112,11 @@ _cb_loaded(void *data, Evas_Object *obj, void *info EINA_UNUSED) snprintf(key, sizeof(key), "%i", pos); evas_object_image_file_set(vidimage, file, key); evas_object_image_size_get(vidimage, , ); - if ((iw <= 0) || (ih <= 0)) break; + if ((iw <= 0) || (ih <= 0)) + { + eet_close(ef); + exit(6); + } w = 160; h = (ih * 160) / iw; if (h < 1) h = 1; @@ -112,7 +128,10 @@ _cb_loaded(void *data, Evas_Object *obj, void *info EINA_UNUSED) eet_data_image_write(ef, key, pixels, w, h, 0, 0, 70, EET_IMAGE_JPEG); else - exit(6); + { + eet_close(ef); + exit(6); + } evas_object_image_data_set(image, pixels); } eet_close(ef); @@ -170,7 +189,7 @@ elm_main(int argc, char **argv) { evas_object_smart_callback_add(vid, "open_done", _cb_loaded, file); emotion_object_file_set(vid, file); -vid_timeout = ecore_timer_add(2.0, _cb_timeout, NULL); +vid_timeout = ecore_timer_add(20.0, _cb_timeout, NULL); elm_run(); } elm_shutdown(); diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c index cc430c8..06db837 100644 --- a/
[EGIT] [apps/rage] master 01/01: rage - yet more browser mode related improvements
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=bbda9033aa0630afbff8d6ed50fa9684537528c6 commit bbda9033aa0630afbff8d6ed50fa9684537528c6 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 14 09:13:13 2015 +0900 rage - yet more browser mode related improvements make video hide on stop so when browser i sback there isnt a dead video in the background make poster mode explicit so timeline thumbs work again add spacing between browser item and make label multi-line ... --- data/themes/default.edc | 81 - src/bin/browser.c | 5 +-- src/bin/key.c | 1 + src/bin/thumb.c | 6 ++-- src/bin/videothumb.c| 29 +- src/bin/videothumb.h| 1 + src/bin/win.c | 7 +++-- src/bin/win.h | 2 +- src/bin/winvid.c| 6 +++- 9 files changed, 106 insertions(+), 32 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 534b182..22ede4c 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -236,6 +236,13 @@ collections { part { name: "rage.content"; type: SWALLOW; description { state: "default" 0.0; + visible: 0; +} +description { state: "novideo" 0.0; + visible: 0; +} +description { state: "video" 0.0; + visible: 1; } } @@ -452,6 +459,15 @@ collections { target: "speaker_clip"; target: "shadow"; target: "statusloc"; +target: "rage.content"; + } + program { +signal: "state,default"; source: "rage"; +action: STATE_SET "default" 0.0; +target: "speaker_clip"; +target: "shadow"; +target: "statusloc"; +target: "rage.content"; } program { signal: "state,video"; source: "rage"; @@ -459,6 +475,7 @@ collections { target: "speaker_clip"; target: "shadow"; target: "statusloc"; +target: "rage.content"; } program { signal: "state,novideo"; source: "rage"; @@ -2126,7 +2143,7 @@ collections { rel2.offset: -1 40; rel2.relative: 1.0 0.0; color: 255 255 255 255; - text { font: "Sans:style=Bold"; size: 20; + text { font: "Sans:style=Bold"; size: 40; align: 0.0 0.0; min: 0 1; elipsis: 0; @@ -2146,9 +2163,14 @@ collections { group { name: "rage/browser/item"; images.image: "win_shadow.png" COMP; - images.image: "win_glow.png" COMP; images.image: "dimmer.png" COMP; + styles { + style { name: "browser_item_label"; +base: "font=Sans font_size=20 color=# wrap=mixed ellipsis=1.0"; + } + } + parts { part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; @@ -2170,22 +2192,20 @@ collections { rel2.to: "clip"; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; rel1.to: "clip"; - rel1.offset: -5 -5; rel2.to: "clip"; - rel2.offset: 4 4; - fill.smooth: 0; - color: 255 255 255 0; + color: 51 153 255 0; visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + rel1.to: "p1"; + rel1.relative: 0.75 0.75; + rel2.to: "p2"; + rel2.relative: 0.25 0.25; + color: 51 153 255 255; visible: 1; } } @@ -2194,18 +2214,45 @@ collections { action: STATE_SET "selected" 0.0; transition: SINUSOIDAL 0.1; target: "glow"; +target: "clip"; } program { signal: "rage,state,unselected"; source: "rage"
[EGIT] [apps/rage] master 01/01: rage - dont flip image in videothumb if poster is loaded
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=5d4705929127d2b09114f27db0fda563d9e69118 commit 5d4705929127d2b09114f27db0fda563d9e69118 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 15 00:51:14 2015 +0900 rage - dont flip image in videothumb if poster is loaded this saves a bit of cpu idling away on still images... --- src/bin/videothumb.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c index 6a16e09..0ac3dd7 100644 --- a/src/bin/videothumb.c +++ b/src/bin/videothumb.c @@ -22,6 +22,7 @@ struct _Videothumb Evas_Coord w, h; Eina_Bool seen : 1; Eina_Bool poster_mode : 1; + Eina_Bool poster : 1; }; static Evas_Smart *_smart = NULL; @@ -253,6 +254,7 @@ _videothumb_image_load(Evas_Object *obj) if (ecore_file_exists(artfile)) { sd->realfile = eina_stringshare_add(artfile); + sd->poster = EINA_TRUE; found = EINA_TRUE; } free(artfile); @@ -529,6 +531,11 @@ _cb_cycle(void *data) { Evas_Object *obj = data; Videothumb *sd = evas_object_smart_data_get(obj); + if (sd->poster) + { +sd->cycle_timer = NULL; +return EINA_FALSE; + } sd->pos += 10.0; if (!sd->thumb_exe) { --
[EGIT] [apps/rage] master 02/02: rage - quieten coverity even though its not an isue
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=40483f4de33d857457db630c5f3ef65fd257f65f commit 40483f4de33d857457db630c5f3ef65fd257f65f Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 14:46:06 2015 +0900 rage - quieten coverity even though its not an isue locks in entry frees are not needed as by the time something is freed a thread is no longer using it, but this should make coverity happy. --- src/bin/browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/browser.c b/src/bin/browser.c index 975e2a2..f53f5f6 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -500,11 +500,13 @@ _entry_free(Entry *entry) Entry *subentry; Eina_Stringshare *str; if (!entry) return; + eina_lock_take(&(entry->lock)); entry->sels = eina_list_free(entry->sels); EINA_LIST_FREE(entry->files, str) eina_stringshare_del(str); EINA_LIST_FREE(entry->dirs, subentry) _entry_free(subentry); if (entry->base) evas_object_del(entry->base); eina_stringshare_del(entry->path); + eina_lock_release(&(entry->lock)); eina_lock_free(&(entry->lock)); if (entry == selentry) selentry = NULL; free(entry); --
[EGIT] [apps/rage] master 01/02: rage - fix coverity issues.
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=25a21888bca3eb6c078097516084bca99ea125a0 commit 25a21888bca3eb6c078097516084bca99ea125a0 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 14:44:26 2015 +0900 rage - fix coverity issues. --- src/bin/albumart.c | 3 +-- src/bin/browser.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bin/albumart.c b/src/bin/albumart.c index d32a532..9faf4fa 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -260,11 +260,10 @@ albumart_find(const char *file, handle_complete = ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, _cb_http_complete, NULL); - if (!file) return; fetchfile = _inpath(file); _fetch_done = fetch_done; - _fetch_data = _fetch_data; + _fetch_data = fetch_data; path = _thumbpath(fetchfile); if (path) diff --git a/src/bin/browser.c b/src/bin/browser.c index 3a1cd9b..975e2a2 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -335,8 +335,7 @@ _entry_files_redo(Evas_Object *win, Entry *entry) _item_size_get(win, , ); cols = w / iw; if (cols < 1) cols = 1; - if (cols > 0) rows = (num + (cols - 1)) / cols; - else rows = 0; + rows = (num + (cols - 1)) / cols; entry->iw = iw; entry->ih = ih; --
[EGIT] [apps/rage] master 04/04: rage - borwser - remember prev selected entry and re-sel on re-show
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=4b516ab8bb701702a95633d3349c55b90e70c92c commit 4b516ab8bb701702a95633d3349c55b90e70c92c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 11:33:00 2015 +0900 rage - borwser - remember prev selected entry and re-sel on re-show --- src/bin/browser.c | 54 ++ 1 file changed, 54 insertions(+) diff --git a/src/bin/browser.c b/src/bin/browser.c index 75a8842..3a1cd9b 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -40,11 +40,17 @@ struct _Entry Eina_Bool sel : 1; }; +static char *selfile = NULL; +static Entry *selentry = NULL; +static int seli = 0; + static Evas_Object *bx = NULL; static Evas_Object *sc, *bt; static Ecore_Thread *fill_thread = NULL; static Entry *dir_entry = NULL; +static void _sel_go(Evas_Object *win EINA_UNUSED, Entry *base_entry, int x, int y); + static void _item_size_get(Evas_Object *win, Evas_Coord *w, Evas_Coord *h) { @@ -122,6 +128,7 @@ _fill_scan(Ecore_Thread *th, Entry *parent, const char *dir) files = ecore_file_ls(dir); if (!files) { +if (entry == selentry) selentry = NULL; free(entry); return NULL; } @@ -298,6 +305,18 @@ _entry_files_unpop(Evas_Object *win EINA_UNUSED, Entry *entry) } static void +_cb_sel_job(void *data) +{ + Evas_Object *win = data; + Entry *entry = selentry; + if ((!dir_entry) || (!entry)) return; + entry->sel = EINA_TRUE; + if (entry->cols > 0) entry->sel_y = seli / entry->cols; + entry->sel_x = seli - (entry->sel_y * entry->cols); + _sel_go(win, dir_entry, 0, 0); +} + +static void _entry_files_redo(Evas_Object *win, Entry *entry) { Evas_Coord x, y,w, h, iw = 1, ih = 1, ww, wh; @@ -330,6 +349,27 @@ _entry_files_redo(Evas_Object *win, Entry *entry) _entry_files_unpop(win, entry); if (eina_rectangles_intersect(, )) _entry_files_pop(win, entry); + if (selfile) + { +Eina_List *l; +const char *file; +char buf[PATH_MAX]; +int i; + +i = 0; +EINA_LIST_FOREACH(entry->files, l, file) + { + snprintf(buf, sizeof(buf), "%s/%s", entry->path, file); + if (!strcmp(buf, selfile)) + { + selentry = entry; + seli = i; + ecore_job_add(_cb_sel_job, win); + break; + } + i++; + } + } done: eina_lock_release(&(entry->lock)); } @@ -467,6 +507,7 @@ _entry_free(Entry *entry) if (entry->base) evas_object_del(entry->base); eina_stringshare_del(entry->path); eina_lock_free(&(entry->lock)); + if (entry == selentry) selentry = NULL; free(entry); } @@ -547,6 +588,7 @@ _sel_go(Evas_Object *win EINA_UNUSED, Entry *base_entry, int x, int y) { Evas_Object *o; Evas_Coord bxx, bxy, tbx, tby; + const char *file; if (!base_entry) return; evas_object_geometry_get(bx, , , NULL, NULL); @@ -677,6 +719,18 @@ _sel_go(Evas_Object *win EINA_UNUSED, Entry *base_entry, int x, int y) eina_lock_release(&(entry->lock)); eina_list_free(flatlist); } + entry = _sel_find(base_entry); + if (entry) + { +file = _sel_file_find(entry); +if (file) + { + char buf[PATH_MAX]; + snprintf(buf, sizeof(buf), "%s/%s", entry->path, file); + if (selfile) free(selfile); + selfile = strdup(buf); + } + } } static void --
[EGIT] [apps/rage] master 02/04: rage - expand stop action to also use backspace and del keys
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=c72e038237152dd068656841da56c6b489e0770d commit c72e038237152dd068656841da56c6b489e0770d Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 10:46:50 2015 +0900 rage - expand stop action to also use backspace and del keys --- src/bin/key.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/key.c b/src/bin/key.c index 69de77d..cb835cd 100644 --- a/src/bin/key.c +++ b/src/bin/key.c @@ -107,7 +107,9 @@ key_handle(Evas_Object *win, Evas_Event_Key_Down *ev) win_do_play_pause(win); } else if ((!strcmp(ev->keyname, "s")) || -(!strcmp(ev->key, "XF86AudioStop"))) +(!strcmp(ev->key, "XF86AudioStop")) || +(!strcmp(ev->key, "BackSpace")) || +(!strcmp(ev->key, "Delete"))) { video_stop(inf->vid); elm_layout_signal_emit(inf->lay, "action,stop", "rage"); @@ -115,7 +117,6 @@ key_handle(Evas_Object *win, Evas_Event_Key_Down *ev) } else if (!strcmp(ev->keyname, "c")) { -printf("(c)lear!\n"); video_stop(inf->vid); elm_layout_signal_emit(inf->lay, "action,stop", "rage"); win_video_free(win); --
[EGIT] [apps/rage] master 03/04: rage browser - delete dir entries when deleting browser on hide
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=04630ed478fedfbd3ebeec184ebe20dabaaedb59 commit 04630ed478fedfbd3ebeec184ebe20dabaaedb59 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 11:06:50 2015 +0900 rage browser - delete dir entries when deleting browser on hide --- src/bin/browser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/browser.c b/src/bin/browser.c index de771fe..75a8842 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -462,9 +462,9 @@ _entry_free(Entry *entry) Eina_Stringshare *str; if (!entry) return; entry->sels = eina_list_free(entry->sels); - if (entry->base) evas_object_del(entry->base); EINA_LIST_FREE(entry->files, str) eina_stringshare_del(str); EINA_LIST_FREE(entry->dirs, subentry) _entry_free(subentry); + if (entry->base) evas_object_del(entry->base); eina_stringshare_del(entry->path); eina_lock_free(&(entry->lock)); free(entry); @@ -793,6 +793,8 @@ _cb_hidden(void *data, Evas_Object *obj, const char *sig EINA_UNUSED, const char elm_layout_signal_callback_del(obj, "browser,state,hidden,finished", "rage", _cb_hidden); if (fill_thread) ecore_thread_cancel(fill_thread); + if (dir_entry) _entry_free(dir_entry); + dir_entry = NULL; evas_object_del(bx); bx = NULL; evas_object_del(bt); --
[EGIT] [apps/rage] master 01/04: rage - dont resize window first audio play after browser mode
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=e76c1c3cf14777299f9d0c222f85134f29b09d2f commit e76c1c3cf14777299f9d0c222f85134f29b09d2f Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Oct 11 10:45:24 2015 +0900 rage - dont resize window first audio play after browser mode --- src/bin/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/main.c b/src/bin/main.c index 3746431..45638f1 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -142,6 +142,7 @@ elm_main(int argc, char **argv) if (file_num <= 0) { inf->browse_mode = EINA_TRUE; +inf->sized = EINA_TRUE; browser_show(win); //elm_layout_signal_emit(inf->lay, "about,show", "rage"); evas_object_show(win); --
[EGIT] [apps/rage] master 01/01: rage - coverity complaint on locks - fix
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=6c616bc6c6e2e221c0fc6427268d41b95238b2ff commit 6c616bc6c6e2e221c0fc6427268d41b95238b2ff Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Oct 12 10:51:03 2015 +0900 rage - coverity complaint on locks - fix --- src/bin/browser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/browser.c b/src/bin/browser.c index f53f5f6..a8f8c1d 100644 --- a/src/bin/browser.c +++ b/src/bin/browser.c @@ -310,9 +310,11 @@ _cb_sel_job(void *data) Evas_Object *win = data; Entry *entry = selentry; if ((!dir_entry) || (!entry)) return; + eina_lock_take(&(entry->lock)); entry->sel = EINA_TRUE; if (entry->cols > 0) entry->sel_y = seli / entry->cols; entry->sel_x = seli - (entry->sel_y * entry->cols); + eina_lock_release(&(entry->lock)); _sel_go(win, dir_entry, 0, 0); } --
[EGIT] [website/www-content] master 01/01: add a small padding svg image
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=df456dd927dd5d85e9fe196982803c1f1ad4f028 commit df456dd927dd5d85e9fe196982803c1f1ad4f028 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jul 8 11:16:49 2015 +0900 add a small padding svg image --- media/scut-pad-sml.svg | 69 ++ 1 file changed, 69 insertions(+) diff --git a/media/scut-pad-sml.svg b/media/scut-pad-sml.svg new file mode 100644 index 000..e760d5d --- /dev/null +++ b/media/scut-pad-sml.svg @@ -0,0 +1,69 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=16 + height=32 + viewBox=0 0 16 32 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=scut-pad-sml.svg + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#303030 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=9.7850467 + inkscape:cx=10.67956 + inkscape:cy=16 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:window-width=3118 + inkscape:window-height=1608 + inkscape:window-x=2138 + inkscape:window-y=239 + inkscape:window-maximized=0 + inkscape:snap-smooth-nodes=true + inkscape:object-nodes=true + inkscape:object-paths=true + inkscape:snap-intersection-paths=true + inkscape:snap-global=false +inkscape:grid + type=xygrid + id=grid4155 + units=px + spacingx=1 + spacingy=1 / + /sodipodi:namedview + metadata + id=metadata7 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + g + inkscape:label=Layer 1 + inkscape:groupmode=layer + id=layer1 + transform=translate(0,-1020.3622) / +/svg --
[EGIT] [website/www-content] master 01/01: www - lighten paypal logo
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3f9bbe42d84f1c920b77f6d04d89831180ef0dc9 commit 3f9bbe42d84f1c920b77f6d04d89831180ef0dc9 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Mon Jul 13 14:34:04 2015 +0900 www - lighten paypal logo --- media/scut-paypal.svg | 50 +++--- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/media/scut-paypal.svg b/media/scut-paypal.svg index 236b960..33b1536 100644 --- a/media/scut-paypal.svg +++ b/media/scut-paypal.svg @@ -26,16 +26,16 @@ inkscape:pageopacity=0 inkscape:pageshadow=2 inkscape:zoom=9.7850467 - inkscape:cx=53.5 + inkscape:cx=32.08978 inkscape:cy=16 inkscape:document-units=px inkscape:current-layer=layer1 showgrid=true units=px - inkscape:window-width=1616 - inkscape:window-height=1408 - inkscape:window-x=2138 - inkscape:window-y=204 + inkscape:window-width=2202 + inkscape:window-height=1662 + inkscape:window-x=2893 + inkscape:window-y=205 inkscape:window-maximized=0 inkscape:snap-smooth-nodes=true inkscape:object-nodes=true @@ -66,27 +66,23 @@ inkscape:groupmode=layer id=layer1 transform=translate(0,-1020.3622) -g - id=g4645 - transform=matrix(1.0494288,0,0,1.0494288,-1.7013865,-51.093488) - path - sodipodi:nodetypes=cscscccscssscscccsscccscscccsccscscscccscscscsc - style=fill:#019be0 - d=m 10.1491,1047.5764 c -0.2295512,-0.1762 -0.2372516,-0.4697 -0.0434,-1.6538 0.07534,-0.4602 2.66e-4,0 0.136985,-0.9308 1.567647,-11.663 3.606683,-18.3924 12.774804,-14.128 0.139834,0.078 0.418796,0.3086 0.619915,0.5117 0.287348,0.29 0.404939,0.4502 0.549004,0.7479 0.463807,0.9582 0.526481,2.1226 0.198775,3.6928 -0.308377,1.4777 -0.910109,2.6645 -1.808632,3.5673 -0.831842,0.8358 -1.730604,1.3244 -2.937703,1.597 -0.232455,0.053 -0.698157,0.079 -1.794017,0.1009 -1.589179,0.032 - [...] - id=path4637 - inkscape:connector-curvature=0 / - path - sodipodi:nodetypes=cscscsccscscccsscssccssscccsscscccsccsscc - style=fill:#123983 - d=m 58.378044,1047.589 c -0.127559,-0.053 -0.209994,-0.2291 -0.174177,-0.3718 0.01511,-0.06 0.596439,-0.9144 1.291859,-1.8983 0.695414,-0.9838 1.299621,-1.8493 1.342678,-1.9233 l 0.07829,-0.1346 -1.117376,-3.2741 c -1.794578,-5.2583 -1.633525,-4.7505 -1.571815,-4.9565 0.09136,-0.3049 0.134735,-0.3134 1.59655,-0.3134 1.375455,0 1.506378,0.018 1.654559,0.2297 0.0818,0.1168 0.178904,0.4197 0.990441,3.0892 0.613832,2.0192 0.633485,2.0773 0.695154,2.0555 0.02287,-0.01 0.811762,-1.13 [...] - id=path4635 - inkscape:connector-curvature=0 / - path - sodipodi:nodetypes=ccsccc - style=fill:#162b70 - d=m 11.516742,1036.8958 c 0.304127,-1.8982 0.554653,-3.4653 0.838128,-5.3183 0.04738,-0.3084 0.118752,-0.6486 0.158603,-0.756 0.0964,-0.2599 0.28936,-0.4721 0.521725,-0.5737 0.178334,-0.078 0.39314,-0.084 3.486549,-0.097 3.350855,-0.014 4.391469,0.017 5.03777,0.1511 0.418241,0.087 1.091257,0.3206 1.091257,0.3723 0,0.022 -0.04364,0.3466 -0.106527,0.6445 -0.389346,1.844 -1.067889,3.1006 -2.166165,4.2072 -0.9833,0.9908 -2.109733,1.5689 -3.539781,1.8435 -0.460832,0.088 -0.722953,0. [...] - id=path4633 - inkscape:connector-curvature=0 / -/g +path + inkscape:connector-curvature=0 + id=path4637 + d=m 8.9493713,1048.2634 c -0.2408976,-0.185 -0.2489786,-0.493 -0.045545,-1.7356 0.079064,-0.4829 2.792e-4,0 0.143756,-0.9768 1.6451339,-12.2395 3.7849569,-19.3015 13.4062469,-14.8263 0.146746,0.082 0.439497,0.3238 0.650557,0.537 0.301551,0.3043 0.424955,0.4724 0.576141,0.7848 0.486732,1.0056 0.552504,2.2276 0.2086,3.8754 -0.32362,1.5507 -0.955095,2.7962 -1.898031,3.7436 -0.872959,0.8771 -1.816145,1.3899 -3.08291,1.6759 -0.243945,0.056 -0.732666,0.083 -1.882693,0.1059 -1.66773,0.0 [...] + style=fill:#019be0 + sodipodi:nodetypes=cscscccscssscscccsscccscscccsccscscscccscscscsc / +path + inkscape:connector-curvature=0 + id=path4635 + d=m 59.562214,1048.2766 c -0.133864,-0.056 -0.220374,-0.2404 -0.182786,-0.3902 0.01586,-0.063 0.62592,-0.9596 1.355714,-1.9921 0.729787,-1.0325 1.36386,-1.9407 1.409045,-2.0184 l 0.08216,-0.1412 -1.172607,-3.436 c -1.883282,-5.5182 -1.714268,-4.9853 -1.649508,-5.2015 0.09588,-0.3199 0.141395,-0.3289 1.675466,-0.3289 1.443442,0 1.580836,0.019 1.736342,0.2411 0.08584,0.1226 0.187747,0.4404 1.039397,3.2419 0.644173,2.119 0.664797,2.18 0.729514,2.1571 0.024,-0.011 0.851887,-1.191 1.8 [...] + style=fill:#1a53be;fill-opacity:1 + sodipodi:nodetypes
[EGIT] [apps/rage] master 01/01: rage - fix videothumb using uniittied buffer for key
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=d0668f7e75b5444789a48e60ffa5846288733b80 commit d0668f7e75b5444789a48e60ffa5846288733b80 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 15 10:46:51 2015 +0900 rage - fix videothumb using uniittied buffer for key --- src/bin/videothumb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c index 0ac3dd7..b29670d 100644 --- a/src/bin/videothumb.c +++ b/src/bin/videothumb.c @@ -283,7 +283,8 @@ _videothumb_image_load(Evas_Object *obj) evas_object_event_callback_add(sd->o_img2, EVAS_CALLBACK_IMAGE_PRELOADED, _cb_preload, obj); - evas_object_image_file_set(sd->o_img2, sd->realfile, buf); + evas_object_image_file_set(sd->o_img2, sd->realfile, + sd->poster ? NULL : buf); evas_object_image_size_get(sd->o_img2, &(sd->iw), &(sd->ih)); _smart_calculate(obj); if (sd->iw > 0) --
[EGIT] [website/www-content] master 01/01: www - docs - force bg in svg's - default bg doesnt work
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=cdf4c9bed1c0428456d71c7ef01d967d4d13fcd9 commit cdf4c9bed1c0428456d71c7ef01d967d4d13fcd9 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Sep 23 19:29:55 2015 +0900 www - docs - force bg in svg's - default bg doesnt work --- media/docs/c/memheapstack.svg | 11 ++- media/docs/c/memory.svg | 19 ++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/media/docs/c/memheapstack.svg b/media/docs/c/memheapstack.svg index d457312..07d5546 100644 --- a/media/docs/c/memheapstack.svg +++ b/media/docs/c/memheapstack.svg @@ -972,7 +972,7 @@ inkscape:snap-others="true" inkscape:object-nodes="true" inkscape:bbox-paths="true" - inkscape:bbox-nodes="false" + inkscape:bbox-nodes="true" inkscape:object-paths="true" inkscape:snap-global="true" inkscape:snap-nodes="true" @@ -1012,6 +1012,15 @@ id="layer1" transform="translate(0,-112.36216)"> + @@ -1787,6 +1787,15 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-112.36216)"> +
[EGIT] [apps/rage] master 01/01: rage - avoid htonl due to windows issues - makes things simpler
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=1d492a68475d9d3c387691445dbeaacafd92a384 commit 1d492a68475d9d3c387691445dbeaacafd92a384 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Sep 23 16:48:41 2015 +0900 rage - avoid htonl due to windows issues - makes things simpler --- src/bin/sha1.c | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/bin/sha1.c b/src/bin/sha1.c index 94661c3..84a943b 100644 --- a/src/bin/sha1.c +++ b/src/bin/sha1.c @@ -1,8 +1,16 @@ -#include -#include +#include #define SHSH(n, v) v) << (n)) & 0x) | ((v) >> (32 - (n +static inline int +int_to_bigendian(int in) +{ + static const unsigned char test[4] = { 0x11, 0x22, 0x33, 0x44 }; + static const unsigned int *test_i = (const unsigned int *)test; + if (test_i[0] == 0x44332211) return eina_swap32(in); + return in; +} + int sha1(unsigned char *data, int size, unsigned char *dst) { @@ -85,11 +93,11 @@ sha1(unsigned char *data, int size, unsigned char *dst) } } - t = htonl(digest[0]); digest[0] = t; - t = htonl(digest[1]); digest[1] = t; - t = htonl(digest[2]); digest[2] = t; - t = htonl(digest[3]); digest[3] = t; - t = htonl(digest[4]); digest[4] = t; + t = int_to_bigendian(digest[0]); digest[0] = t; + t = int_to_bigendian(digest[1]); digest[1] = t; + t = int_to_bigendian(digest[2]); digest[2] = t; + t = int_to_bigendian(digest[3]); digest[3] = t; + t = int_to_bigendian(digest[4]); digest[4] = t; memcpy(dst, digest, 5 * 4); return 1; --
[EGIT] [website/www] master 01/01: e www - shot - upgrade max shot size to 20m
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=3c1136577cf33497ffa4adcf3eed0fccc9b2c7da commit 3c1136577cf33497ffa4adcf3eed0fccc9b2c7da Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Tue Sep 22 19:09:54 2015 +0900 e www - shot - upgrade max shot size to 20m --- public_html/shot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public_html/shot.php b/public_html/shot.php index 0ef7d64..a963605 100644 --- a/public_html/shot.php +++ b/public_html/shot.php @@ -48,8 +48,8 @@ function dothumb($f, $thumb, $new_w, $new_h) { } ob_start(); - limit - 6 mb. -$data = file_get_contents('php://input', NULL, NULL, 0, 6 * 1024 * 1024); + limit - 20 mb. +$data = file_get_contents('php://input', NULL, NULL, 0, 20 * 1024 * 1024); magic jpeg signature $jpeg_match = "\xff\xd8\xff\xe0"; $jpeg_magic = substr($data, 0, 4); --
[EGIT] [website/www-content] master 01/01: www docs - fix background of diagrams to work when printed
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b4ba1bf6a2cf08188101e641d2534108b6970983 commit b4ba1bf6a2cf08188101e641d2534108b6970983 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Wed Sep 23 18:29:40 2015 +0900 www docs - fix background of diagrams to work when printed --- media/docs/c/memheapstack.svg | 10 +- media/docs/c/memory.svg | 27 +++ 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/media/docs/c/memheapstack.svg b/media/docs/c/memheapstack.svg index ab12d59..d457312 100644 --- a/media/docs/c/memheapstack.svg +++ b/media/docs/c/memheapstack.svg @@ -954,9 +954,9 @@ pagecolor="#202020" bordercolor="#66" borderopacity="1.0" - inkscape:pageopacity="0" + inkscape:pageopacity="1" inkscape:pageshadow="2" - inkscape:zoom="2.0808511" + inkscape:zoom="2.0531915" inkscape:cx="180" inkscape:cy="470" inkscape:document-units="px" @@ -976,9 +976,9 @@ inkscape:object-paths="true" inkscape:snap-global="true" inkscape:snap-nodes="true" - inkscape:window-width="3036" - inkscape:window-height="2092" - inkscape:window-x="2724" + inkscape:window-width="1599" + inkscape:window-height="2070" + inkscape:window-x="1528" inkscape:window-y="0" inkscape:window-maximized="0"> - - + inkscape:window-x="1874" + inkscape:window-y="43" + inkscape:window-maximized="0" /> --
[EGIT] [admin/devs] master 01/01: restore apache user for dev so wiki can commit to git back-end again. it seems to have been broken since about nov 27 and can't figure out why/where/what.
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a9dd4c6000a7ef75ee2bda23d778e639f4211d4d commit a9dd4c6000a7ef75ee2bda23d778e639f4211d4d Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Dec 7 20:58:38 2015 +0900 restore apache user for dev so wiki can commit to git back-end again. it seems to have been broken since about nov 27 and can't figure out why/where/what. get this working again. --- developers/apache/id_rsa.pub | 1 + developers/apache/info.txt | 7 +++ 2 files changed, 8 insertions(+) diff --git a/developers/apache/id_rsa.pub b/developers/apache/id_rsa.pub new file mode 100644 index 000..927718c --- /dev/null +++ b/developers/apache/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAACAQC65Ndvm9TPNMVnWN+MLy8eAb9sHlhB933Sy2eKkzU+hgUGZz2VU4CZz09R0YWnAsc6OEtvTWVFhUC32wQVf4sPJBBwpTUbxR9G1D9FCtVOXUda2fi7wyx4ZmZevavbTR96asiLJ9xegV+F/15DWcV0RTCUv185UUFgA6AVCWZ3tVd4W1WKLgjUhBqPad6ds0lRvMuXzj203EKbr1Iv+65aEa1zGxC1hfCsqEKndraxA9zAXPlofpP6zm53f7WpsEhUKOS4JlLt/YF0mbq4dvVIssSgzfnUQqYbrsNmOGqmi/cTDOyRovKOSn7XtrPSHItPLIFWJpyxitZThAjQKz/l2xicGgOFz/LHUHZMp+rx0FQ4szfkQKbIk7oEcNOHPKqjPsYQCNNqfIlTKNSFAW3qgBr3gapBLD26x9NSbEKOzA8YdolhjWou0bLLRxK2I0fJLN+t [...] diff --git a/developers/apache/info.txt b/developers/apache/info.txt new file mode 100644 index 000..c5a5e3b --- /dev/null +++ b/developers/apache/info.txt @@ -0,0 +1,7 @@ +Login:apache +IRC Nick: N/A +Cloak:N/A +Name: Wiki Web Bot +WWW: http://www.enlightenment.org +E-Mail: n...@anlightenment.org +Managing: www-content --
[EGIT] [admin/devs] master 01/01: ok devs - remove apache again and do this some other way
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=3608a076d38d8fd58131bf2b3f988ca26715ad14 commit 3608a076d38d8fd58131bf2b3f988ca26715ad14 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Dec 7 21:09:07 2015 +0900 ok devs - remove apache again and do this some other way --- developers/apache/id_rsa.pub | 1 - developers/apache/info.txt | 7 --- 2 files changed, 8 deletions(-) diff --git a/developers/apache/id_rsa.pub b/developers/apache/id_rsa.pub deleted file mode 100644 index 927718c..000 --- a/developers/apache/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAACAQC65Ndvm9TPNMVnWN+MLy8eAb9sHlhB933Sy2eKkzU+hgUGZz2VU4CZz09R0YWnAsc6OEtvTWVFhUC32wQVf4sPJBBwpTUbxR9G1D9FCtVOXUda2fi7wyx4ZmZevavbTR96asiLJ9xegV+F/15DWcV0RTCUv185UUFgA6AVCWZ3tVd4W1WKLgjUhBqPad6ds0lRvMuXzj203EKbr1Iv+65aEa1zGxC1hfCsqEKndraxA9zAXPlofpP6zm53f7WpsEhUKOS4JlLt/YF0mbq4dvVIssSgzfnUQqYbrsNmOGqmi/cTDOyRovKOSn7XtrPSHItPLIFWJpyxitZThAjQKz/l2xicGgOFz/LHUHZMp+rx0FQ4szfkQKbIk7oEcNOHPKqjPsYQCNNqfIlTKNSFAW3qgBr3gapBLD26x9NSbEKOzA8YdolhjWou0bLLRxK2I0fJLN+t [...] diff --git a/developers/apache/info.txt b/developers/apache/info.txt deleted file mode 100644 index c5a5e3b..000 --- a/developers/apache/info.txt +++ /dev/null @@ -1,7 +0,0 @@ -Login:apache -IRC Nick: N/A -Cloak:N/A -Name: Wiki Web Bot -WWW: http://www.enlightenment.org -E-Mail: n...@anlightenment.org -Managing: www-content --
[EGIT] [apps/rage] master 01/01: rage - ensure art is gone when swithing to a video after art display
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=18b174d82228e14a005642f531540288cf0783e5 commit 18b174d82228e14a005642f531540288cf0783e5 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Dec 13 16:12:24 2015 +0900 rage - ensure art is gone when swithing to a video after art display --- src/bin/video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/video.c b/src/bin/video.c index 1bc6c53..d8ff3ac 100644 --- a/src/bin/video.c +++ b/src/bin/video.c @@ -292,7 +292,7 @@ _ob_resize(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coor sd->pih = sd->ih; evas_object_smart_callback_call(obj, "frame_resize", NULL); } - if ((sd->tw > 0) && (sd->th > 0)) + if ((sd->tw > 0) && (sd->th > 0) && (sd->doart)) { int iw, ih; @@ -647,6 +647,7 @@ video_art_set(Evas_Object *obj, Eina_Bool art) Video *sd = evas_object_smart_data_get(obj); if (!sd) return; sd->doart = art; + if (!sd->doart) evas_object_hide(sd->o_img); } Eina_Bool --
[EGIT] [apps/rage] master 01/01: rage - speaker - simplify the imagery for it
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=2009a559ea6b3f486b76e669f2fbcf29159b6ef7 commit 2009a559ea6b3f486b76e669f2fbcf29159b6ef7 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Dec 12 23:59:07 2015 +0900 rage - speaker - simplify the imagery for it --- data/themes/default.edc | 24 data/themes/images/Makefile.mk | 2 -- data/themes/images/speaker-base.png | Bin 19231 -> 10119 bytes data/themes/images/speaker-bevel-hi.png | Bin 1979 -> 0 bytes data/themes/images/speaker-bevel-lo.png | Bin 1874 -> 0 bytes 5 files changed, 26 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 5904d96..9a15762 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -35,8 +35,6 @@ collections { images.image: "win_shadow.png" COMP; images.image: "speaker-base.png" COMP; - images.image: "speaker-bevel-hi.png" COMP; - images.image: "speaker-bevel-lo.png" COMP; images.image: "speaker-over.png" COMP; images.image: "speaker-shadow.png" COMP; @@ -418,28 +416,6 @@ collections { color: 255 255 255 128; } } - part { name: "speaker_lo"; -clip_to: "speaker_clip"; -description { state: "default" 0.0; - rel1.to: "speaker_base"; - rel1.offset: 0 1; - rel2.to: "speaker_base"; - rel2.relative: 1.0 0.5; - rel2.offset: -1 0; - image.normal: "speaker-bevel-lo.png"; -} - } - part { name: "speaker_hi"; -clip_to: "speaker_clip"; -description { state: "default" 0.0; - rel1.to: "speaker_base"; - rel1.relative: 0.0 0.5; - rel1.offset: 0 -1; - rel2.to: "speaker_base"; - rel2.offset: -1 -2; - image.normal: "speaker-bevel-hi.png"; -} - } part { name: "speaker_cover"; clip_to: "speaker_clip"; description { state: "default" 0.0; diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk index 172b567..b7a13a3 100644 --- a/data/themes/images/Makefile.mk +++ b/data/themes/images/Makefile.mk @@ -26,8 +26,6 @@ data/themes/images/r-4.png \ data/themes/images/shadow_circle_horiz.png \ data/themes/images/shadow_circle_vert.png \ data/themes/images/speaker-base.png \ -data/themes/images/speaker-bevel-hi.png \ -data/themes/images/speaker-bevel-lo.png \ data/themes/images/speaker-over.png \ data/themes/images/speaker-shadow.png \ data/themes/images/tv-bg.png \ diff --git a/data/themes/images/speaker-base.png b/data/themes/images/speaker-base.png index 3645874..89aa598 100644 Binary files a/data/themes/images/speaker-base.png and b/data/themes/images/speaker-base.png differ diff --git a/data/themes/images/speaker-bevel-hi.png b/data/themes/images/speaker-bevel-hi.png deleted file mode 100644 index 66e4864..000 Binary files a/data/themes/images/speaker-bevel-hi.png and /dev/null differ diff --git a/data/themes/images/speaker-bevel-lo.png b/data/themes/images/speaker-bevel-lo.png deleted file mode 100644 index 73f4f2c..000 Binary files a/data/themes/images/speaker-bevel-lo.png and /dev/null differ --
[EGIT] [apps/rage] master 01/02: eage theme/look - update it to be simpler along with existing changes
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=609fd3e35c7e54e27f05eaecee18c01ca23d1d3b commit 609fd3e35c7e54e27f05eaecee18c01ca23d1d3b Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Dec 12 22:51:57 2015 +0900 eage theme/look - update it to be simpler along with existing changes this up[dates most icons etc. --- data/themes/default.edc | 98 data/themes/images/Makefile.mk | 35 +++--- data/themes/images/bevel_dark_out.png | Bin 93 -> 0 bytes data/themes/images/bg_bevel.png | Bin 255 -> 0 bytes data/themes/images/bg_glint.png | Bin 343 -> 0 bytes data/themes/images/bg_shine.png | Bin 7300 -> 0 bytes data/themes/images/glow_exclam.png | Bin 2185 -> 0 bytes data/themes/images/icon_arrow_right.png | Bin 1930 -> 277 bytes data/themes/images/icon_close.png | Bin 3136 -> 567 bytes data/themes/images/icon_close2.png | Bin 3854 -> 0 bytes data/themes/images/icon_eject.png | Bin 2419 -> 297 bytes data/themes/images/icon_exclamation.png | Bin 0 -> 587 bytes data/themes/images/icon_forward.png | Bin 2432 -> 403 bytes data/themes/images/icon_fullscreen.png | Bin 2116 -> 519 bytes data/themes/images/icon_fullscreen2.png | Bin 3578 -> 0 bytes data/themes/images/icon_mute.png| Bin 3975 -> 688 bytes data/themes/images/icon_next.png| Bin 2141 -> 392 bytes data/themes/images/icon_next2.png | Bin 2405 -> 0 bytes data/themes/images/icon_pause.png | Bin 1791 -> 255 bytes data/themes/images/icon_pause2.png | Bin 2135 -> 0 bytes data/themes/images/icon_play.png| Bin 1676 -> 301 bytes data/themes/images/icon_play2.png | Bin 1987 -> 0 bytes data/themes/images/icon_prev.png| Bin 2146 -> 338 bytes data/themes/images/icon_prev2.png | Bin 2353 -> 0 bytes data/themes/images/icon_refresh.png | Bin 4672 -> 681 bytes data/themes/images/icon_rewind.png | Bin 2481 -> 280 bytes data/themes/images/icon_spanner.png | Bin 1981 -> 650 bytes data/themes/images/icon_spanner2.png| Bin 3213 -> 0 bytes data/themes/images/icon_stop.png| Bin 1747 -> 252 bytes data/themes/images/icon_unfullscreen.png| Bin 2099 -> 481 bytes data/themes/images/icon_unfullscreen2.png | Bin 2957 -> 0 bytes data/themes/images/icon_volume.png | Bin 2221 -> 390 bytes data/themes/images/icon_volume2.png | Bin 2547 -> 0 bytes data/themes/images/pm_overlay.png | Bin 8673 -> 0 bytes data/themes/images/pm_shadow.png| Bin 4010 -> 0 bytes data/themes/images/posglow.png | Bin 519 -> 0 bytes data/themes/images/vgrad-dark-inv-trans.png | Bin 4246 -> 0 bytes data/themes/images/vgrad-dark-inv.png | Bin 3896 -> 0 bytes data/themes/images/win_glow.png | Bin 604 -> 0 bytes data/themes/orig/musicmode.xcf.gz | Bin 241067 -> 0 bytes data/themes/orig/next.xcf.gz| Bin 3347 -> 0 bytes data/themes/orig/pause.xcf.gz | Bin 2856 -> 0 bytes data/themes/orig/play.xcf.gz| Bin 3227 -> 0 bytes data/themes/orig/prev.xcf.gz| Bin 3393 -> 0 bytes data/themes/orig/vol.xcf.gz | Bin 6205 -> 0 bytes 45 files changed, 49 insertions(+), 84 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 5d26899..5904d96 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1,15 +1,14 @@ collections { - + group { name: "rage/core"; images.image: "pm_fill.png" COMP; - images.image: "pm_shadow.png" COMP; images.image: "vg1.png" COMP; images.image: "vg2.png" COMP; images.image: "shadow_circle_horiz.png" COMP; images.image: "shadow_circle_vert.png" COMP; - images.image: "glow_exclam.png" COMP; + images.image: "icon_exclamation.png" COMP; images.image: "icon_eject.png" COMP; @@ -32,29 +31,15 @@ collections { images.image: "icon_fullscreen.png" COMP; images.image: "icon_unfullscreen.png" COMP; images.image: "icon_close.png" COMP; - + images.image: "win_shadow.png" COMP; - images.image: "vgrad-dark-inv.png" COMP; - images.image: "vgrad-dark-inv-trans.png" COMP; - images.image: "posglow.png" COMP; - images.image: "speaker-base.png" COMP; images.image: "speaker-bevel-hi.png" COMP; images.image: "speaker-bevel-l
[EGIT] [apps/rage] master 02/02: rage - make albumart fetch work again
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=f7a916dc8f758527fce70c18d619ede117a48c5c commit f7a916dc8f758527fce70c18d619ede117a48c5c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Dec 12 23:23:26 2015 +0900 rage - make albumart fetch work again --- src/bin/win.c | 25 ++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index ca55f85..b501426 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -180,9 +180,17 @@ _cb_fetched(void *data) file = video_file_get(inf->vid); if (file) { -char *path = albumart_file_get(file); -win_art(win, path); -free(path); +char *realfile = ecore_file_realpath(file); +if (realfile) + { + char *path = albumart_file_get(realfile); + if (path) + { + win_art(win, path); + free(path); + } + free(realfile); + } } } @@ -299,6 +307,17 @@ win_do_next(Evas_Object *win) static void _restart_vid(Evas_Object *win, Evas_Object *lay, Evas_Object *vid, const char *file, const char *sub) { + const char *extn = strchr(file, '.'); + if ((extn) && + ((!strcasecmp(extn, ".mp3")) || +(!strcasecmp(extn, ".m4a")) || +(!strcasecmp(extn, ".oga")) || +(!strcasecmp(extn, ".aac")) || +(!strcasecmp(extn, ".flac")) || +(!strcasecmp(extn, ".wav" + video_art_set(vid, EINA_TRUE); + else + video_art_set(vid, EINA_FALSE); video_position_set(vid, 0.0); video_play_set(vid, EINA_FALSE); video_file_autosub_set(vid, file, sub); --
[EGIT] [apps/rage] master 01/01: add speaker orig svg
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=803f4e8093dd2126eee299c46a90b599d2281299 commit 803f4e8093dd2126eee299c46a90b599d2281299 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Dec 13 00:00:27 2015 +0900 add speaker orig svg --- data/themes/orig/speaker-base.svgz | Bin 0 -> 1049 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/orig/speaker-base.svgz b/data/themes/orig/speaker-base.svgz new file mode 100644 index 000..2b00987 Binary files /dev/null and b/data/themes/orig/speaker-base.svgz differ --
[EGIT] [apps/rage] master 01/01: rage - on stop if there is no browser mode, then quit
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=bd9af8405bcfebe2eab3a362b2466209d4018183 commit bd9af8405bcfebe2eab3a362b2466209d4018183 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Dec 13 00:02:54 2015 +0900 rage - on stop if there is no browser mode, then quit there is no point hanging about stopped unless we have a browser, so quit --- src/bin/key.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/key.c b/src/bin/key.c index 1a3d1b2..aa9e968 100644 --- a/src/bin/key.c +++ b/src/bin/key.c @@ -115,6 +115,7 @@ key_handle(Evas_Object *win, Evas_Event_Key_Down *ev) elm_layout_signal_emit(inf->lay, "action,stop", "rage"); elm_layout_signal_emit(inf->lay, "state,default", "rage"); if (inf->browse_mode) browser_show(win); +else evas_object_del(win); } else if (!strcmp(ev->keyname, "c")) { --
[EGIT] [admin/devs] master 01/01: update andreas ssh pub key
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=28ae630b74e56244c4efb8db868d46fa82cf3103 commit 28ae630b74e56244c4efb8db868d46fa82cf3103 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Jan 3 11:17:53 2016 +0900 update andreas ssh pub key --- developers/andreas/id_dsa_lenovix.pub | 1 - developers/andreas/id_dsa_thor.pub| 1 - developers/andreas/id_rsa_thor.pub| 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/developers/andreas/id_dsa_lenovix.pub b/developers/andreas/id_dsa_lenovix.pub deleted file mode 100644 index d3bff4f..000 --- a/developers/andreas/id_dsa_lenovix.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAJJUWcMTqdSXijfeveXrDJ4xGwn0W6wr9HMnQZJdttC8PglQy/zEcjFDGWrd/iF1JoDMlxc2gTea0YRvf7ha9+MDqsYuHYjgQUVxSu+4B6mtB4tKSkuwOKDQYb5TFBsvIkLkfzyROYElo0Ir4kcR7f02vxYb9eYsiLlwXQweTu99FQDsvo1xuWMt9xeQrWUl+iLnSBuhnwAAAIBx/YDP3qYo1ZjHBpoZRBAci24FWwXMFLAG0zYIt0mTMF6VwbeZ3exad7c06AaMJR6Mput/ZLIeve0SQ1wG+WPj3j9BVTnp1E3v8GQoS8heLMWuEv6HQLI91gM6orxoqfCUFFv7O3yDT2pa1o9qyJJJq5+UoQ8fT06+PyYer/GufwAAAIAFaD9gMYWNx0HDuAjO7NpS6pQxIJv8lgR/EfctnRqbVm4JACJgW/X+AahGxAFtU7kV874dBVB7bhEN [...] diff --git a/developers/andreas/id_dsa_thor.pub b/developers/andreas/id_dsa_thor.pub deleted file mode 100644 index 4891ca3..000 --- a/developers/andreas/id_dsa_thor.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss B3NzaC1kc3MAAACBAKnJdC5SU4K7+C911LEhb8A2CqWuGWwj55uCMBkfm6H8LfRU+TUYGEBAYrYaaGkXVJ9bSY1c9NPk0PVthv/O3uBWbX0kCUxwYS5uRCHmH2LfWqw2mlkXk4gAz8BbeFv5iW4dFgBfkrdJFokwkxA/PprzavVn7hhSrZaTSyUKF3jVFQDpo024ED1YYnqSrNcHnM6A+tWAUwAAAIBZSd1tdMT7F72I9eX2oX5fCJAht9jwcSCdzg5AHTM0QStrwWrZZYNSSorwWQFGH4dVp7nT/w/nHyOOGGfzL+CebyDzoNUIUG2TmZ2jC5ht35un68fAWRgYIoSvr1j03Sgrg/x7Fl2qAO6x8P1mzNobLujTAvDdrDA6vbF1Hum7lwAAAIEAi1f89UcHlQeBR8oV4F6tSOcemuJ30t3/C3EJtMOXmXJYBUYoHhFnJZ/G/kr65fqT8FBbn7Ep1WCt [...] diff --git a/developers/andreas/id_rsa_thor.pub b/developers/andreas/id_rsa_thor.pub new file mode 100644 index 000..d203f42 --- /dev/null +++ b/developers/andreas/id_rsa_thor.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAABAQCjhE99MEU5cD7vRaP3UBZ0AKQtdknIuORGgcmgUjObaP3kO9wjakmweYmjOyG06ixS599sv6dwOPZ4naeS2I/0dFQrTxg/EdqO+KE3siERU1RfEhRM7lji1OeycuRTfZ69VpcGUQNWa8XWZlvPeUCYq3zg7N4E0vVHRvhC1cllx+MgxWb+IXMMm74W8Lj1A7DUM4OjNj1gM2AI9W6rZApaY6rs5Ecl89x3iUybgUATpiYT4udkOkZJn/DEKQEMnm6UZx6jQiWZ45JwtjhjVulgXoULPUAh1CuZCa4oGufA9n9DrdUMYWSWBzhNQMMrZyxG9DFfOm9bCEPj/x1eWF1p andreas@thor --
[EGIT] [apps/rage] master 01/01: rage theme - make checks smaller again. they were too big to look nice.
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=9c8483ab309e1cac00e688f00852be42bc9a3992 commit 9c8483ab309e1cac00e688f00852be42bc9a3992 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Dec 26 22:41:29 2015 +0900 rage theme - make checks smaller again. they were too big to look nice. --- data/themes/images/pm_fill.png | Bin 1193 -> 1406 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/images/pm_fill.png b/data/themes/images/pm_fill.png index 7ff9cff..aaa4c44 100644 Binary files a/data/themes/images/pm_fill.png and b/data/themes/images/pm_fill.png differ --
[EGIT] [apps/rage] master 02/03: rage win - send focus/unfocus signals to base layout
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=c253dc0830da310f93efe6f2ebcec033d31a91bf commit c253dc0830da310f93efe6f2ebcec033d31a91bf Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 21 18:56:50 2015 +0900 rage win - send focus/unfocus signals to base layout --- src/bin/win.c | 16 1 file changed, 16 insertions(+) diff --git a/src/bin/win.c b/src/bin/win.c index 399141d..69abc87 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -33,6 +33,20 @@ _cb_unfullscreen(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUS } static void +_cb_focused(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) +{ + Inf *inf = evas_object_data_get(obj, "inf"); + elm_layout_signal_emit(inf->lay, "state,win,focused", "rage"); +} + +static void +_cb_unfocused(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) +{ + Inf *inf = evas_object_data_get(obj, "inf"); + elm_layout_signal_emit(inf->lay, "state,win,unfocused", "rage"); +} + +static void _cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _cb_win_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *ev EINA_UNUSED) @@ -407,6 +421,8 @@ win_add(void) evas_object_smart_callback_add(win, "fullscreen", _cb_fullscreen, NULL); evas_object_smart_callback_add(win, "unfullscreen", _cb_unfullscreen, NULL); evas_object_smart_callback_add(win, "normal", _cb_unfullscreen, NULL); + evas_object_smart_callback_add(win, "focused", _cb_focused, NULL); + evas_object_smart_callback_add(win, "unfocused", _cb_unfocused, NULL); o = evas_object_image_add(evas_object_evas_get(win)); snprintf(buf, sizeof(buf), "%s/images/rage.png", elm_app_data_dir_get()); --
[EGIT] [apps/rage] master 03/03: rage look/theme - update it to be more conservative
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=b7fb245ac29c4902c384f7b577e0063f27a2bc32 commit b7fb245ac29c4902c384f7b577e0063f27a2bc32 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 21 22:48:25 2015 +0900 rage look/theme - update it to be more conservative this makes the theme a bit flatter and more conservative. still more to go though. --- data/themes/default.edc| 354 ++--- data/themes/images/Makefile.mk | 4 + data/themes/images/pm_fill.png | Bin 254 -> 1193 bytes data/themes/images/shadow_circle_horiz.png | Bin 0 -> 609 bytes data/themes/images/shadow_circle_vert.png | Bin 0 -> 777 bytes data/themes/images/vg1.png | Bin 0 -> 36711 bytes data/themes/images/vg2.png | Bin 0 -> 36575 bytes 7 files changed, 122 insertions(+), 236 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 22ede4c..f44709f 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -2,12 +2,16 @@ collections { group { name: "rage/core"; images.image: "bg_bevel.png" COMP; - images.image: "bevel_dark_out.png" COMP; images.image: "pm_fill.png" COMP; - images.image: "pm_overlay.png" COMP; images.image: "pm_shadow.png" COMP; + images.image: "vg1.png" COMP; + images.image: "vg2.png" COMP; + + images.image: "shadow_circle_horiz.png" COMP; + images.image: "shadow_circle_vert.png" COMP; + images.image: "glow_exclam.png" COMP; - + images.image: "icon_eject.png" COMP; images.image: "icon_mute.png" COMP; @@ -31,8 +35,6 @@ collections { images.image: "icon_close.png" COMP; images.image: "win_shadow.png" COMP; - images.image: "bg_shine.png" COMP; - images.image: "bg_glint.png" COMP; images.image: "vgrad-dark-inv.png" COMP; images.image: "vgrad-dark-inv-trans.png" COMP; @@ -82,41 +84,67 @@ collections { parts { -- BACKGROUND + part { name: "bg"; type: RECT; mouse_events: 0; +description { state: "default" 0.0; + color: 64 64 64 255; +} + } part { name: "fill"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; image.normal: "pm_fill.png"; + color: 56 56 56 255; fill { size.relative: 0.0 0.0; - size.offset: 64 64; + size.offset: 256 256; } } } - part { name: "popmedia_overlay"; mouse_events: 0; + part { name: "vg1"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; - image.normal: "pm_overlay.png"; - fill.smooth: 0; + rel2.relative: 1.0 0.0; + rel2.to: "vg2"; + image.normal: "vg1.png"; + color: 64 64 64 255; + fill { + size.relative: 0.0 1.0; + size.offset: 256 0; + smooth: 0; + } +} +description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 32 32 32 255; } } - part { name: "bevel2"; + part { name: "vg2"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "bg_bevel.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + fixed: 1 1; + align: 0.5 1.0; + image.normal: "vg2.png"; + color: 64 64 64 255; + max: 9 32; + fill { + size.relative: 0.0 1.0; + size.offset: 256 0; + smooth: 0; + } } } - part { name: "shadow"; mouse_events: 0; + program { +signal: "state,win,focused"; source: "rage"; +action: STATE_SET "focused" 0.0; +target: "vg1"; + } + program { +signal: "state,win,unfocused"; source: "rage"; +action: STATE_SET "default" 0.0; +target: "vg1"; + } + + part { name: "shadow"; type: RECT; de
[EGIT] [apps/rage] master 01/01: rage - fix segv on shutdown with focus change emit
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=60f89b11f7a0fa0d729ae1c2631a019fe85c669c commit 60f89b11f7a0fa0d729ae1c2631a019fe85c669c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 21 22:54:43 2015 +0900 rage - fix segv on shutdown with focus change emit --- src/bin/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index 69abc87..31631b7 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -36,14 +36,14 @@ static void _cb_focused(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Inf *inf = evas_object_data_get(obj, "inf"); - elm_layout_signal_emit(inf->lay, "state,win,focused", "rage"); + if (inf) elm_layout_signal_emit(inf->lay, "state,win,focused", "rage"); } static void _cb_unfocused(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { Inf *inf = evas_object_data_get(obj, "inf"); - elm_layout_signal_emit(inf->lay, "state,win,unfocused", "rage"); + if (inf) elm_layout_signal_emit(inf->lay, "state,win,unfocused", "rage"); } static void --
[EGIT] [apps/rage] master 01/03: rage - remove printf debug we dont need now
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=bc872611be100c6dd7af99af75275abe121b5b80 commit bc872611be100c6dd7af99af75275abe121b5b80 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 21 18:53:09 2015 +0900 rage - remove printf debug we dont need now --- src/bin/videothumb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c index b29670d..8de04c9 100644 --- a/src/bin/videothumb.c +++ b/src/bin/videothumb.c @@ -146,7 +146,6 @@ _videothumb_launch_do(Evas_Object *obj) snprintf(buf, sizeof(buf), "%s/rage/utils/rage_thumb %s 1 %i >& /dev/null", libdir, s, sd->poster_mode ? 1 : 0); - printf("RUN: %s\n", buf); sd->thumb_exe = ecore_exe_pipe_run(buf, ECORE_EXE_TERM_WITH_PARENT | ECORE_EXE_NOT_LEADER, --
[EGIT] [apps/rage] master 01/01: rage - more theme work adjusting look
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=f701a7f50c50702116cbfc560faf8f4d41696e6e commit f701a7f50c50702116cbfc560faf8f4d41696e6e Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 22 12:05:14 2015 +0900 rage - more theme work adjusting look --- data/themes/default.edc | 51 data/themes/images/speaker-over.png | Bin 9425 -> 2381 bytes 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index f44709f..35a6497 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1,7 +1,6 @@ collections { group { name: "rage/core"; - images.image: "bg_bevel.png" COMP; images.image: "pm_fill.png" COMP; images.image: "pm_shadow.png" COMP; images.image: "vg1.png" COMP; @@ -366,17 +365,10 @@ collections { visible: 0; } } - part { name: "speaker_bg_shadow"; mouse_events: 0; + part { name: "speaker_bg"; type: RECT; clip_to: "speaker_clip"; description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "speaker_base"; - rel2.to: "speaker_base"; - image.normal: "pm_shadow.png"; - image.border: 64 64 64 64; - rel1.offset: -32 -32; - rel2.offset: 31 31; - fill.smooth: 0; + color: 64 64 64 255; } } part { name: "speaker_base"; type: RECT; @@ -438,6 +430,7 @@ collections { rel1.to: "speaker_base"; rel2.to: "speaker_base"; image.normal: "speaker-shadow.png"; + color: 255 255 255 128; } } part { name: "speaker_lo"; @@ -468,17 +461,7 @@ collections { rel1.to: "speaker_base"; rel2.to: "speaker_base"; image.normal: "speaker-over.png"; -} - } - part { name: "speaker_bevel"; -clip_to: "speaker_clip"; -description { state: "default" 0.0; - rel1.to: "speaker_cover"; - rel2.to: "speaker_cover"; - image.normal: "bg_bevel.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; + color: 64 64 64 255; } } program { @@ -527,17 +510,17 @@ collections { program { signal: "state,noart"; source: "rage"; action: STATE_SET "default" 0.0; -transition: ACCELERATE 1.0; +transition: ACCELERATE 0.3; target: "art_clip"; } program { signal: "state,art"; source: "rage"; action: STATE_SET "visible" 0.0; -transition: DECELERATE 1.0; +transition: DECELERATE 0.3; target: "art_clip"; } - part { name: "rage.gesture"; type: SWALLOW; + part { name: "rage.gesture"; type: SWALLOW; repeat_events: 1; description { state: "default" 0.0; } } @@ -1001,19 +984,16 @@ collections { part { name: "rage.pos"; type: TEXT; mouse_events: 0; clip_to: "controlbar_clip"; -effect: GLOW; scale: 1; description { state: "default" 0.0; fixed: 1 1; rel1.to: "slash"; rel1.relative: 0.0 0.0; - rel1.offset: -1 0; + rel1.offset: -5 0; rel2.to: "slash"; rel2.relative: 0.0 1.0; - rel2.offset: -1 -1; + rel2.offset: -5 -1; color: 255 255 255 255; - color2: 51 153 255 128; - color3: 51 153 255 20; align: 1.0 0.5; text { font: "Sans"; size: 8; align: 1.0 0.5; @@ -1024,19 +1004,16 @@ collections { } part { name: "slash"; type: TEXT; mouse_events: 0; clip_to: "controlbar_clip"; -effect: GLOW; scale: 1; description { state: "default" 0.0; fixed: 1 1; rel1.to: "rage.length"; rel1.relative: 0.0 0.0; - rel1.offset: -1 0; + rel1.offset: -5 0; re
[EGIT] [apps/rage] master 01/01: rage - getsure layer - swallow properly and fix clash with controlbar
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=fdb74fe665371a5f0bd3ca408fc489042b67a6b4 commit fdb74fe665371a5f0bd3ca408fc489042b67a6b4 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 22 12:52:41 2015 +0900 rage - getsure layer - swallow properly and fix clash with controlbar --- data/themes/default.edc | 4 +++- src/bin/win.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 35a6497..5d26899 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -520,8 +520,10 @@ collections { target: "art_clip"; } - part { name: "rage.gesture"; type: SWALLOW; repeat_events: 1; + part { name: "rage.gesture"; type: SWALLOW; description { state: "default" 0.0; + rel2.to_y: "controlbar"; + rel2.relative: 1.0 0.0; } } diff --git a/src/bin/win.c b/src/bin/win.c index bff2bb5..ca55f85 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -493,7 +493,6 @@ win_add(void) o = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, o); evas_object_color_set(o, 0, 0, 0, 0); evas_object_repeat_events_set(o, EINA_TRUE); evas_object_show(o); --
[EGIT] [apps/rage] master 01/01: rage - also support cover+front images for albums
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=bdeeb9e284166a815dea6eff11d7595da5744f29 commit bdeeb9e284166a815dea6eff11d7595da5744f29 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 22 10:51:22 2015 +0900 rage - also support cover+front images for albums --- src/bin/albumart.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/bin/albumart.c b/src/bin/albumart.c index b5c7722..78a9cc9 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -378,6 +378,11 @@ albumart_file_get(const char *file) sprintf(tmp, "%s/.thumb/%s.jpeg", dir, fraw); if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/cover.jpg", dir); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/front.jpg", dir); + if (ecore_file_exists(tmp)) goto found; + free(dir); free(fraw); return _thumbpath(file); --
[EGIT] [apps/rage] master 01/01: rage - single click will play/pause now and double still (un)fullscreen
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=cb641e6a2a8c35700925afc5a30958fce19ba9c9 commit cb641e6a2a8c35700925afc5a30958fce19ba9c9 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sun Nov 22 11:45:41 2015 +0900 rage - single click will play/pause now and double still (un)fullscreen --- src/bin/win.c | 61 --- src/bin/win.h | 3 +++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index 31631b7..bff2bb5 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -59,6 +59,7 @@ _cb_win_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void if (inf->drag_anim) ecore_animator_del(inf->drag_anim); if (inf->mouse_idle_timeout) ecore_timer_del(inf->mouse_idle_timeout); if (inf->albumart_timeout) ecore_timer_del(inf->albumart_timeout); + if (inf->down_timeout) ecore_timer_del(inf->down_timeout); EINA_LIST_FREE(inf->file_list, vid) { if (vid->file) eina_stringshare_del(vid->file); @@ -110,10 +111,62 @@ _cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, static void _cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { - Evas_Event_Mouse_Down *m_info = event_info; + Evas_Event_Mouse_Down *ev = event_info; + Inf *inf = evas_object_data_get(data, "inf"); - if (m_info->flags & EVAS_BUTTON_DOUBLE_CLICK) - elm_win_fullscreen_set(data, !elm_win_fullscreen_get(data)); + if (ev->button != 1) return; + if (inf) + { +if (inf->down) return; +inf->down = EINA_TRUE; +inf->down_x = ev->canvas.x; +inf->down_y = ev->canvas.y; + } + if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) + { +elm_win_fullscreen_set(data, !elm_win_fullscreen_get(data)); +if (inf->down_timeout) + { + ecore_timer_del(inf->down_timeout); + inf->down_timeout = NULL; + } + } +} + +static Eina_Bool +_cb_down_timeout(void *data) +{ + Inf *inf = evas_object_data_get(data, "inf"); + if (inf) + { +inf->down_timeout = NULL; +win_do_play_pause(data); + } + return EINA_FALSE; +} + +static void +_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) +{ + Evas_Event_Mouse_Up *ev = event_info; + Inf *inf = evas_object_data_get(data, "inf"); + Evas_Coord dx, dy; + + if (ev->button != 1) return; + if (!inf->down) return; + inf->down = EINA_FALSE; + if (!(ev->flags & EVAS_BUTTON_DOUBLE_CLICK)) + { +dx = abs(ev->canvas.x - inf->down_x); +dy = abs(ev->canvas.y - inf->down_y); +if ((dx <= elm_config_finger_size_get()) && +(dy <= elm_config_finger_size_get()) && +(inf)) + { + if (inf->down_timeout) ecore_timer_del(inf->down_timeout); + inf->down_timeout = ecore_timer_add(0.3, _cb_down_timeout, data); + } + } } static void @@ -451,6 +504,8 @@ win_add(void) _cb_mouse_move, win); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _cb_mouse_down, win); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, + _cb_mouse_up, win); elm_object_part_content_set(inf->lay, "rage.gesture", o); gesture_init(win, o); dnd_init(win, o); diff --git a/src/bin/win.h b/src/bin/win.h index 1d542fa..6c60ef2 100644 --- a/src/bin/win.h +++ b/src/bin/win.h @@ -11,6 +11,7 @@ struct _Inf Ecore_Timer *show_timeout; Ecore_Timer *mouse_idle_timeout; Ecore_Timer *albumart_timeout; + Ecore_Timer *down_timeout; Ecore_Animator *drag_anim; double last_action; double jump; @@ -18,12 +19,14 @@ struct _Inf double drag_time, drag_start; int zoom_mode; int drag_dist, drag_momentum; + Evas_Coord down_x, down_y; Eina_Bool sized : 1; Eina_Bool last_action_rwind : 1; Eina_Bool playing : 1; Eina_Bool was_playing : 1; Eina_Bool dragging : 1; Eina_Bool browse_mode : 1; + Eina_Bool down : 1; }; // ui high level controls --
[EGIT] [apps/rage] master 01/01: rage albumart - use image files in saame dir as media file if there
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=1f6f9b084b83bf2587313c35f8812d485fd6b827 commit 1f6f9b084b83bf2587313c35f8812d485fd6b827 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Sat Nov 21 18:16:41 2015 +0900 rage albumart - use image files in saame dir as media file if there if you have file.mp4 then this will use file.mp4.png file.mp4.jpg file.mp3.jpeg in that order (first found wins) in the same dir instead of googling for an image. it will also try after the abover, in order: file.png file.jpg file.jpeg .file.mp4.png .file.mp4.jpg .file.mp4.jpeg .file.png .file.jpg .file.jpeg .thumb/file.mp4.png .thumb/file.mp4.jpg .thumb/file.mp3.jpeg .thumb/file.png .thumb/file.jpg .thumb/file.jpeg first one found wins. if none of these exist, then google shall be consulted. :) --- src/bin/albumart.c | 69 ++ 1 file changed, 69 insertions(+) diff --git a/src/bin/albumart.c b/src/bin/albumart.c index 6331058..b5c7722 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -315,5 +315,74 @@ albumart_find(const char *file, char * albumart_file_get(const char *file) { + char *tmp = alloca(strlen(file) + 1 + 100); + char *dir, *fraw, *s; + const char *fname; + + sprintf(tmp, "%s.png", file); + if (ecore_file_exists(tmp)) return strdup(tmp); + sprintf(tmp, "%s.jpg", file); + if (ecore_file_exists(tmp)) return strdup(tmp); + sprintf(tmp, "%s.jpeg", file); + if (ecore_file_exists(tmp)) return strdup(tmp); + + dir = ecore_file_dir_get(file); + if (!dir) dir = strdup("."); + fname = ecore_file_file_get(file); + if (!fname) + { +free(dir); +return NULL; + } + fraw = strdup(fname); + if (!fraw) + { +free(dir); +return NULL; + } + s = strrchr(fraw, '.'); + if (s) *s = 0; + + sprintf(tmp, "%s/%s.png", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/%s.jpg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/%s.jpeg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + + sprintf(tmp, "%s/.%s.png", dir, fname); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.%s.jpg", dir, fname); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.%s.jpeg", dir, fname); + if (ecore_file_exists(tmp)) goto found; + + sprintf(tmp, "%s/.%s.png", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.%s.jpg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.%s.jpeg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + + sprintf(tmp, "%s/.thumb/%s.png", dir, fname); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.thumb/%s.jpg", dir, fname); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.thumb/%s.jpeg", dir, fname); + if (ecore_file_exists(tmp)) goto found; + + sprintf(tmp, "%s/.thumb/%s.png", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.thumb/%s.jpg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + sprintf(tmp, "%s/.thumb/%s.jpeg", dir, fraw); + if (ecore_file_exists(tmp)) goto found; + + free(dir); + free(fraw); return _thumbpath(file); +found: + free(dir); + free(fraw); + return strdup(tmp); } --
[EGIT] [admin/devs] master 01/01: Apache user is back - whatever keeps happing on www.e.org to stop the wiki from being able to commit and losing its ssh creds is now just too painful. do it the good
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a4ff9b51b3e7ca783c578cced5f3ebecd14c58ee commit a4ff9b51b3e7ca783c578cced5f3ebecd14c58ee Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Fri Feb 5 16:50:50 2016 +0900 Apache user is back - whatever keeps happing on www.e.org to stop the wiki from being able to commit and losing its ssh creds is now just too painful. do it the good olde way that everyone can deal with - ssh pub keys for apache user. --- developers/apache/id_rsa.pub | 1 + developers/apache/info.txt | 7 +++ 2 files changed, 8 insertions(+) diff --git a/developers/apache/id_rsa.pub b/developers/apache/id_rsa.pub new file mode 100644 index 000..adaf73c --- /dev/null +++ b/developers/apache/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAACAQC5RDOkanPfecjzSiUQI1EdD/n958r/15Ag3f00u8bhdw1PozipuJwgJEQ+tDpD2l9q0IqbBzgcDv0Ct1bBQclFH28piwLsPkMhz7plsaM2O1xTKi3rmfQg5EMkCxJV8raGs6zHj4F/ov7N1Qn8EmLy2Nl8Ipg9k63PZNm3tKH+rSWgmFKwuZPEOWYa1cQQ6h5boVvvdsniB8OAWM19tCBuvuJjgmz8kEGpdd2Z1C01NWInKC4ic6nu7ZFqHHGc4aEmxjYe7sIo48aIreWk2Y6a1x4+RYv4oEQTZeYUYnTCtZF9SEh9ix4GFsJsKtkk0iRN81Fa+zDrsYWyvSwMskHm2hiiDd9n4P1K5c5PUZKjOn0+Ihb4nocepm9zIIZkH79LNlKF/DArMIIBnOYRhVBuiTAqi26WDh+9+iXuCrXxxGcJdsQ7NkXeNwh2VZgUqejlYaD2 [...] diff --git a/developers/apache/info.txt b/developers/apache/info.txt new file mode 100644 index 000..c5a5e3b --- /dev/null +++ b/developers/apache/info.txt @@ -0,0 +1,7 @@ +Login:apache +IRC Nick: N/A +Cloak:N/A +Name: Wiki Web Bot +WWW: http://www.enlightenment.org +E-Mail: n...@anlightenment.org +Managing: www-content --
[EGIT] [website/www] master 01/01: dokuwiki plugins - add news plugin
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=7de8d9f02dba2b57540df8a91af015490c19ca65 commit 7de8d9f02dba2b57540df8a91af015490c19ca65 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 11:15:16 2016 +0900 dokuwiki plugins - add news plugin --- public_html/lib/plugins/anewssystem/INFO |8 + public_html/lib/plugins/anewssystem/README | 28 + public_html/lib/plugins/anewssystem/VERSION|1 + public_html/lib/plugins/anewssystem/action.php | 241 public_html/lib/plugins/anewssystem/backlink.js| 42 + .../lib/plugins/anewssystem/conf/default.php | 23 + .../lib/plugins/anewssystem/conf/metadata.php | 21 + .../lib/plugins/anewssystem/dropdowncontent.js | 137 +++ .../lib/plugins/anewssystem/images/bullet.png | Bin 0 -> 206 bytes .../lib/plugins/anewssystem/images/delete.gif | Bin 0 -> 925 bytes .../lib/plugins/anewssystem/images/delete_hov.gif | Bin 0 -> 925 bytes public_html/lib/plugins/anewssystem/images/dot.gif | Bin 0 -> 832 bytes .../lib/plugins/anewssystem/images/dot2.gif| Bin 0 -> 832 bytes .../lib/plugins/anewssystem/images/edit.gif| Bin 0 -> 926 bytes .../lib/plugins/anewssystem/images/edit_hov.gif| Bin 0 -> 926 bytes .../lib/plugins/anewssystem/images/toc-arrows.png | Bin 0 -> 225 bytes .../lib/plugins/anewssystem/images/toc-bullet.png | Bin 0 -> 121 bytes .../plugins/anewssystem/images/toolbar/bold.png| Bin 0 -> 251 bytes .../plugins/anewssystem/images/toolbar/code.png| Bin 0 -> 658 bytes .../plugins/anewssystem/images/toolbar/enlarge.png | Bin 0 -> 379 bytes .../lib/plugins/anewssystem/images/toolbar/h1.png | Bin 0 -> 290 bytes .../lib/plugins/anewssystem/images/toolbar/h2.png | Bin 0 -> 328 bytes .../lib/plugins/anewssystem/images/toolbar/h3.png | Bin 0 -> 322 bytes .../lib/plugins/anewssystem/images/toolbar/h4.png | Bin 0 -> 310 bytes .../lib/plugins/anewssystem/images/toolbar/h5.png | Bin 0 -> 325 bytes .../lib/plugins/anewssystem/images/toolbar/hr.png | Bin 0 -> 254 bytes .../plugins/anewssystem/images/toolbar/italic.png | Bin 0 -> 241 bytes .../plugins/anewssystem/images/toolbar/link.png| Bin 0 -> 405 bytes .../anewssystem/images/toolbar/linkextern.png | Bin 0 -> 904 bytes .../plugins/anewssystem/images/toolbar/mono.png| Bin 0 -> 296 bytes .../lib/plugins/anewssystem/images/toolbar/ol.png | Bin 0 -> 304 bytes .../plugins/anewssystem/images/toolbar/reduce.png | Bin 0 -> 356 bytes .../plugins/anewssystem/images/toolbar/strike.png | Bin 0 -> 318 bytes .../anewssystem/images/toolbar/subscript.png | Bin 0 -> 359 bytes .../anewssystem/images/toolbar/superscript.png | Bin 0 -> 357 bytes .../lib/plugins/anewssystem/images/toolbar/ul.png | Bin 0 -> 291 bytes .../anewssystem/images/toolbar/underline.png | Bin 0 -> 317 bytes .../lib/plugins/anewssystem/lang/de/lang.php | 33 + .../lib/plugins/anewssystem/lang/de/settings.php | 21 + .../lib/plugins/anewssystem/lang/en/lang.php | 33 + .../lib/plugins/anewssystem/lang/en/settings.php | 21 + .../lib/plugins/anewssystem/lang/it/lang.php | 35 + .../lib/plugins/anewssystem/lang/it/settings.php | 17 + .../lib/plugins/anewssystem/plugin.info.txt|9 + public_html/lib/plugins/anewssystem/style.css | 353 ++ public_html/lib/plugins/anewssystem/syntax.php | 1187 .../lib/plugins/anewssystem/tpl/newstemplate.txt | 10 + .../plugins/anewssystem/tpl/newstemplate_de.txt| 10 + .../plugins/anewssystem/tpl/newstemplate_en.txt| 10 + .../plugins/anewssystem/tpl/newstemplate_it.txt| 10 + 50 files changed, 2250 insertions(+) diff --git a/public_html/lib/plugins/anewssystem/INFO b/public_html/lib/plugins/anewssystem/INFO new file mode 100644 index 000..56ee566 --- /dev/null +++ b/public_html/lib/plugins/anewssystem/INFO @@ -0,0 +1,8 @@ +# PLUGIN INFO - DO NOT EDIT! + +author Taggic +email tag...@t-online.de +date2015-02-11 +nameanewssystem +descprovides an easy to handle, page based news system +url http://www.dokuwiki.org/plugin:anewssystem diff --git a/public_html/lib/plugins/anewssystem/README b/public_html/lib/plugins/anewssystem/README new file mode 100644 index 000..2efd0b0 --- /dev/null +++ b/public_html/lib/plugins/anewssystem/README @@ -0,0 +1,28 @@ +/** +* anewssystem Plugin: +* +* @licenseGPL 2 (http://www.gnu.org/licenses/gpl.html) +* @author Taggic <tag...@t-online.de> +*/ + +Intro +-- + +Syntax +--- + + +Installation + + Just download and extract it as folder �anewssystem� into your �\lib\plugins� + directory or put the link into the Plugin Manager for automated installation: + https://
[EGIT] [website/www] master 01/01: e www: link news and blog to wiki pages no phab
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=7a0b7222ddedf70bc465a48d8fc1e4fa003ee2d0 commit 7a0b7222ddedf70bc465a48d8fc1e4fa003ee2d0 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 12:05:53 2016 +0900 e www: link news and blog to wiki pages no phab phab now dropped styling for blogs. we'll migrate news over to wiki then. this startes things off. --- public_html/lib/tpl/e/nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public_html/lib/tpl/e/nav.html b/public_html/lib/tpl/e/nav.html index 37e5c74..e564bb2 100644 --- a/public_html/lib/tpl/e/nav.html +++ b/public_html/lib/tpl/e/nav.html @@ -3,6 +3,6 @@ Download Contact Docs -https://phab.enlightenment.org/phame/live/3;>News -https://phab.enlightenment.org/phame/live/1;>Blog +News +Blog https://phab.enlightenment.org/;>Devel --
[EGIT] [website/www] master 01/01: www - fix nav synatx
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=f7694afa4b853e3b34d649a3d349a7395c716013 commit f7694afa4b853e3b34d649a3d349a7395c716013 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 12:07:20 2016 +0900 www - fix nav synatx --- public_html/lib/tpl/e/nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public_html/lib/tpl/e/nav.html b/public_html/lib/tpl/e/nav.html index e564bb2..520907c 100644 --- a/public_html/lib/tpl/e/nav.html +++ b/public_html/lib/tpl/e/nav.html @@ -3,6 +3,6 @@ Download Contact Docs -News -Blog +News +Blog https://phab.enlightenment.org/;>Devel --
[EGIT] [website/www-content] master 01/01: www - remove empty news
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0a505b0ebb4bbca5b2b194165f762f8ab4d56e1c commit 0a505b0ebb4bbca5b2b194165f762f8ab4d56e1c Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 12:34:06 2016 +0900 www - remove empty news --- pages/news/newsdata.txt | 12 1 file changed, 12 deletions(-) diff --git a/pages/news/newsdata.txt b/pages/news/newsdata.txt index eee6d14..3ce1fa8 100644 --- a/pages/news/newsdata.txt +++ b/pages/news/newsdata.txt @@ -1,15 +1,3 @@ -== == - - * anchor: #20160214192756 - * head: - * subtitle: - * link: /news/allnewsdata#20160214192756 - * start: 2016-02-14 - * stop: 2016-06-14 - * text: - * author: raster - * tags: - == Sample 2 == * anchor: #20160214191846 --
[EGIT] [website/www-content] master 01/01: www - move news-add toa separate page to be included
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=4d2c0044f235d722adf0bfa02c397488cea7307a commit 4d2c0044f235d722adf0bfa02c397488cea7307a Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 12:42:29 2016 +0900 www - move news-add toa separate page to be included --- pages/news-add.txt | 3 +++ pages/news.txt | 5 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/news-add.txt b/pages/news-add.txt new file mode 100644 index 000..1b18c82 --- /dev/null +++ b/pages/news-add.txt @@ -0,0 +1,3 @@ +**[[news:news|Add News]]** + + diff --git a/pages/news.txt b/pages/news.txt index ce7a39d..aa9b322 100644 --- a/pages/news.txt +++ b/pages/news.txt @@ -1,8 +1,5 @@ ~~Title: News~~ News ~~NOCACHE~~ -**[[news:news|Add News]]** - - - +{{page>news-add}} {{anss>allnews}} --
[EGIT] [website/www-content] master 01/01: www: add alllnewsdata
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=cd354c8c7a15f65aa35556d016a76e2652ef35ad commit cd354c8c7a15f65aa35556d016a76e2652ef35ad Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 12:59:37 2016 +0900 www: add alllnewsdata --- pages/news/allnewsdata.txt | 4 1 file changed, 4 insertions(+) diff --git a/pages/news/allnewsdata.txt b/pages/news/allnewsdata.txt new file mode 100644 index 000..9676f21 --- /dev/null +++ b/pages/news/allnewsdata.txt @@ -0,0 +1,4 @@ +~~Title: Latest News~~ +== Latest News == +~~NOCACHE~~ +{{anss>allnews}} --
[EGIT] [website/www-content] master 01/01: www: news - make all news same as main news page
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=072d6494ae9d1dd36cf9a74f1883f9d7c5d4 commit 072d6494ae9d1dd36cf9a74f1883f9d7c5d4 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:11:10 2016 +0900 www: news - make all news same as main news page --- pages/news/allnewsdata.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/news/allnewsdata.txt b/pages/news/allnewsdata.txt index 9676f21..df3ce40 100644 --- a/pages/news/allnewsdata.txt +++ b/pages/news/allnewsdata.txt @@ -1,4 +1,4 @@ -~~Title: Latest News~~ -== Latest News == +~~Title: News~~ + News ~~NOCACHE~~ {{anss>allnews}} --
[EGIT] [website/www] master 01/01: e www - news - update css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=c76b66b31d2f72aec55aef36f08ea43af9868eac commit c76b66b31d2f72aec55aef36f08ea43af9868eac Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:47:31 2016 +0900 e www - news - update css --- public_html/lib/tpl/e/css/modifications.css | 84 + 1 file changed, 84 insertions(+) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 5bb8f41..2774a83 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -576,3 +576,87 @@ table { margin-top: 10px; margin-bottom: 10px; } + +.news_date { + font-size: 50%; + font-style: italic; + color: #88; +} + +.news_subtitle { + font-size: 80%; + font-style: italic; + color: #aa; +} + +.news_preview { + font-size: 14px; + line-height: 100%; + color: #88; + margin: 0; + padding: 0; +} + +.anss_del_img { + border: 0; + border-radius: 4px; + background-color: #202020; + background-image: url(/images/delete.png); + background-repeat: no-repeat; + background-position: center; + margin-top: 0px; + margin-bottom: 0px; + margin-right: 0px; + margin-left: 0px; + width: 40px; + height: 40px; + float: right; +} + +.anss_del_img:hover { + border: 0; + border-radius: 4px; + background-color: #606060; + background-image: url(/images/delete_hov.png) !important; + background-repeat: no-repeat; + background-position: center; + margin-top: 0px; + margin-bottom: 0px; + margin-right: 0px; + margin-left: 0px; + width: 40px; + height: 40px; + float: right; +} + +.anss_edit_img { + border: 0; + border-radius: 4px; + background-color: #202020; + background-image: url(/images/edit.png); + background-repeat: no-repeat; + background-position: center; + margin-top: 0px; + margin-bottom: 0px; + margin-right: 0px; + margin-left: 0px; + width: 40px; + height: 40px; + float: right; +} + +.anss_edit_img:hover { + border: 0; + border-radius: 4px; + background-color: #606060; + background-image:url(/images/edit_hov.png) !important; + background-repeat: no-repeat; + background-position: center; + margin-top: 0px; + margin-bottom: 0px; + margin-right: 0px; + margin-left: 0px; + width: 40px; + height: 40px; + float: right; +} --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=c6064ffa4a6fe965f14a5215ba99dc33dd8c2a92 commit c6064ffa4a6fe965f14a5215ba99dc33dd8c2a92 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:51:28 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 2774a83..9ecf55a 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -610,7 +610,7 @@ table { margin-left: 0px; width: 40px; height: 40px; - float: right; + float: left; } .anss_del_img:hover { @@ -622,11 +622,11 @@ table { background-position: center; margin-top: 0px; margin-bottom: 0px; - margin-right: 0px; + margin-left: 0px; margin-left: 0px; width: 40px; height: 40px; - float: right; + float: left; } .anss_edit_img { @@ -638,11 +638,11 @@ table { background-position: center; margin-top: 0px; margin-bottom: 0px; - margin-right: 0px; + margin-left: 0px; margin-left: 0px; width: 40px; height: 40px; - float: right; + float: left; } .anss_edit_img:hover { @@ -654,9 +654,9 @@ table { background-position: center; margin-top: 0px; margin-bottom: 0px; - margin-right: 0px; + margin-left: 0px; margin-left: 0px; width: 40px; height: 40px; - float: right; + float: left; } --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=e8e4be0ee5be1b1cb6fb9a5af8f9111240381804 commit e8e4be0ee5be1b1cb6fb9a5af8f9111240381804 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:53:44 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 30 - 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 9ecf55a..a4b3110 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -590,7 +590,7 @@ table { } .news_preview { - font-size: 14px; + font-size: 100%; line-height: 100%; color: #88; margin: 0; @@ -604,13 +604,14 @@ table { background-image: url(/images/delete.png); background-repeat: no-repeat; background-position: center; + padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-right: 0px; margin-left: 0px; - width: 40px; - height: 40px; - float: left; + width: 24px; + height: 24px; + float: clear; } .anss_del_img:hover { @@ -620,13 +621,14 @@ table { background-image: url(/images/delete_hov.png) !important; background-repeat: no-repeat; background-position: center; + padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-left: 0px; - width: 40px; - height: 40px; - float: left; + width: 24px; + height: 24px; + float: clear; } .anss_edit_img { @@ -636,13 +638,14 @@ table { background-image: url(/images/edit.png); background-repeat: no-repeat; background-position: center; + padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-left: 0px; - width: 40px; - height: 40px; - float: left; + width: 24px; + height: 24px; + float: clear; } .anss_edit_img:hover { @@ -652,11 +655,12 @@ table { background-image:url(/images/edit_hov.png) !important; background-repeat: no-repeat; background-position: center; + padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-left: 0px; - width: 40px; - height: 40px; - float: left; + width: 24px; + height: 24px; + float: clear; } --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=17de74278e7a090b8ad68f6bdf93ad43e0de8347 commit 17de74278e7a090b8ad68f6bdf93ad43e0de8347 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:55:40 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index a4b3110..8eb1cb7 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -607,11 +607,11 @@ table { padding: 8px; margin-top: 0px; margin-bottom: 0px; - margin-right: 0px; margin-left: 0px; + margin-right: 0px; width: 24px; height: 24px; - float: clear; + float: ; } .anss_del_img:hover { @@ -625,7 +625,7 @@ table { margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-left: 0px; + margin-right: 0px; width: 24px; height: 24px; float: clear; @@ -642,7 +642,7 @@ table { margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-left: 0px; + margin-right: 0px; width: 24px; height: 24px; float: clear; @@ -659,7 +659,7 @@ table { margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-left: 0px; + margin-right: 0px; width: 24px; height: 24px; float: clear; --
[EGIT] [website/www] master 01/01: www - news
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=cef04bc168e7340599d3c325fd53dcefa77e1404 commit cef04bc168e7340599d3c325fd53dcefa77e1404 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 16:56:41 2016 +0900 www - news --- public_html/lib/tpl/e/css/modifications.css | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 8eb1cb7..693fc80 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -611,7 +611,7 @@ table { margin-right: 0px; width: 24px; height: 24px; - float: ; + float: right; } .anss_del_img:hover { @@ -628,7 +628,7 @@ table { margin-right: 0px; width: 24px; height: 24px; - float: clear; + float: right; } .anss_edit_img { @@ -645,7 +645,7 @@ table { margin-right: 0px; width: 24px; height: 24px; - float: clear; + float: right; } .anss_edit_img:hover { @@ -662,5 +662,5 @@ table { margin-right: 0px; width: 24px; height: 24px; - float: clear; + float: right; } --
[EGIT] [website/www] master 01/01: www - nws css - add icons
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=9bfcfe66ce1b870eb5fb7a9ffa481f52098ac2a8 commit 9bfcfe66ce1b870eb5fb7a9ffa481f52098ac2a8 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:04:45 2016 +0900 www - nws css - add icons --- public_html/lib/tpl/e/images/delete.png | Bin 0 -> 472 bytes public_html/lib/tpl/e/images/delete_hov.png | Bin 0 -> 368 bytes public_html/lib/tpl/e/images/edit.png | Bin 0 -> 407 bytes public_html/lib/tpl/e/images/edit_hov.png | Bin 0 -> 307 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public_html/lib/tpl/e/images/delete.png b/public_html/lib/tpl/e/images/delete.png new file mode 100644 index 000..93bf5c2 Binary files /dev/null and b/public_html/lib/tpl/e/images/delete.png differ diff --git a/public_html/lib/tpl/e/images/delete_hov.png b/public_html/lib/tpl/e/images/delete_hov.png new file mode 100644 index 000..d644a38 Binary files /dev/null and b/public_html/lib/tpl/e/images/delete_hov.png differ diff --git a/public_html/lib/tpl/e/images/edit.png b/public_html/lib/tpl/e/images/edit.png new file mode 100644 index 000..8126d2c Binary files /dev/null and b/public_html/lib/tpl/e/images/edit.png differ diff --git a/public_html/lib/tpl/e/images/edit_hov.png b/public_html/lib/tpl/e/images/edit_hov.png new file mode 100644 index 000..48bab47 Binary files /dev/null and b/public_html/lib/tpl/e/images/edit_hov.png differ --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=aa1d905e6b478e85b6aa01c484c44b19977799a7 commit aa1d905e6b478e85b6aa01c484c44b19977799a7 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:07:43 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 693fc80..967829f 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -601,7 +601,7 @@ table { border: 0; border-radius: 4px; background-color: #202020; - background-image: url(/images/delete.png); + background-image: url(images/delete.png); background-repeat: no-repeat; background-position: center; padding: 8px; @@ -618,7 +618,7 @@ table { border: 0; border-radius: 4px; background-color: #606060; - background-image: url(/images/delete_hov.png) !important; + background-image: url(images/delete_hov.png) !important; background-repeat: no-repeat; background-position: center; padding: 8px; @@ -635,7 +635,7 @@ table { border: 0; border-radius: 4px; background-color: #202020; - background-image: url(/images/edit.png); + background-image: url(images/edit.png); background-repeat: no-repeat; background-position: center; padding: 8px; @@ -652,7 +652,7 @@ table { border: 0; border-radius: 4px; background-color: #606060; - background-image:url(/images/edit_hov.png) !important; + background-image:url(images/edit_hov.png) !important; background-repeat: no-repeat; background-position: center; padding: 8px; --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=12be70d388274e098e40227d75d430955c28a219 commit 12be70d388274e098e40227d75d430955c28a219 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:14:22 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 967829f..9fecb81 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -578,19 +578,19 @@ table { } .news_date { - font-size: 50%; + font-size: 10px; font-style: italic; color: #88; } .news_subtitle { - font-size: 80%; + font-size: 12px; font-style: italic; color: #aa; } .news_preview { - font-size: 100%; + font-size: 14px; line-height: 100%; color: #88; margin: 0; --
[EGIT] [website/www] master 01/01: www - news css
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=f1b6b509d88247a2b2ebde5dd724f8b6fe283944 commit f1b6b509d88247a2b2ebde5dd724f8b6fe283944 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:21:16 2016 +0900 www - news css --- public_html/lib/tpl/e/css/modifications.css | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 9fecb81..5c5341a 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -601,7 +601,7 @@ table { border: 0; border-radius: 4px; background-color: #202020; - background-image: url(images/delete.png); + background-image: url("/lib/tpl/e/images/delete.png"); background-repeat: no-repeat; background-position: center; padding: 8px; @@ -611,56 +611,56 @@ table { margin-right: 0px; width: 24px; height: 24px; - float: right; + float: none; } .anss_del_img:hover { border: 0; border-radius: 4px; background-color: #606060; - background-image: url(images/delete_hov.png) !important; + background-image: url("/lib/tpl/e/images/delete_hov.png") !important; background-repeat: no-repeat; background-position: center; padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-right: 0px; + margin-none: 0px; width: 24px; height: 24px; - float: right; + float: none; } .anss_edit_img { border: 0; border-radius: 4px; background-color: #202020; - background-image: url(images/edit.png); + background-image: url("/lib/tpl/e/images/edit.png"); background-repeat: no-repeat; background-position: center; padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-right: 0px; + margin-none: 0px; width: 24px; height: 24px; - float: right; + float: none; } .anss_edit_img:hover { border: 0; border-radius: 4px; background-color: #606060; - background-image:url(images/edit_hov.png) !important; + background-image:url("/lib/tpl/e/images/edit_hov.png") !important; background-repeat: no-repeat; background-position: center; padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; - margin-right: 0px; + margin-none: 0px; width: 24px; height: 24px; - float: right; + float: none; } --
[EGIT] [website/www] master 01/01: www - nws css - scale down icons
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=daabc5d8d295dca0f4d8e4c72fc184b1a610acfc commit daabc5d8d295dca0f4d8e4c72fc184b1a610acfc Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:23:29 2016 +0900 www - nws css - scale down icons --- public_html/lib/tpl/e/images/delete.png | Bin 472 -> 341 bytes public_html/lib/tpl/e/images/delete_hov.png | Bin 368 -> 267 bytes public_html/lib/tpl/e/images/edit.png | Bin 407 -> 296 bytes public_html/lib/tpl/e/images/edit_hov.png | Bin 307 -> 241 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public_html/lib/tpl/e/images/delete.png b/public_html/lib/tpl/e/images/delete.png index 93bf5c2..70dd521 100644 Binary files a/public_html/lib/tpl/e/images/delete.png and b/public_html/lib/tpl/e/images/delete.png differ diff --git a/public_html/lib/tpl/e/images/delete_hov.png b/public_html/lib/tpl/e/images/delete_hov.png index d644a38..ac9cec3 100644 Binary files a/public_html/lib/tpl/e/images/delete_hov.png and b/public_html/lib/tpl/e/images/delete_hov.png differ diff --git a/public_html/lib/tpl/e/images/edit.png b/public_html/lib/tpl/e/images/edit.png index 8126d2c..b591345 100644 Binary files a/public_html/lib/tpl/e/images/edit.png and b/public_html/lib/tpl/e/images/edit.png differ diff --git a/public_html/lib/tpl/e/images/edit_hov.png b/public_html/lib/tpl/e/images/edit_hov.png index 48bab47..6c322fe 100644 Binary files a/public_html/lib/tpl/e/images/edit_hov.png and b/public_html/lib/tpl/e/images/edit_hov.png differ --
[EGIT] [website/www] master 01/01: www - news - remove padding
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=ead0296b468fb17ffed55e81368019d0a89ad4c4 commit ead0296b468fb17ffed55e81368019d0a89ad4c4 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:24:15 2016 +0900 www - news - remove padding --- public_html/lib/tpl/e/css/modifications.css | 4 1 file changed, 4 deletions(-) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 5c5341a..5888f5b 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -604,7 +604,6 @@ table { background-image: url("/lib/tpl/e/images/delete.png"); background-repeat: no-repeat; background-position: center; - padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; @@ -621,7 +620,6 @@ table { background-image: url("/lib/tpl/e/images/delete_hov.png") !important; background-repeat: no-repeat; background-position: center; - padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; @@ -638,7 +636,6 @@ table { background-image: url("/lib/tpl/e/images/edit.png"); background-repeat: no-repeat; background-position: center; - padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; @@ -655,7 +652,6 @@ table { background-image:url("/lib/tpl/e/images/edit_hov.png") !important; background-repeat: no-repeat; background-position: center; - padding: 8px; margin-top: 0px; margin-bottom: 0px; margin-left: 0px; --
[EGIT] [website/www] master 01/01: www - news - fix add news form
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=bd4bfd3bb93d64a89561a32c65f40809b198176a commit bd4bfd3bb93d64a89561a32c65f40809b198176a Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Mon Feb 15 17:30:34 2016 +0900 www - news - fix add news form --- public_html/lib/tpl/e/css/modifications.css | 9 + 1 file changed, 9 insertions(+) diff --git a/public_html/lib/tpl/e/css/modifications.css b/public_html/lib/tpl/e/css/modifications.css index 5888f5b..7c971fc 100644 --- a/public_html/lib/tpl/e/css/modifications.css +++ b/public_html/lib/tpl/e/css/modifications.css @@ -660,3 +660,12 @@ table { height: 24px; float: none; } + +.news_form_div { + border: 0px + background: transparent; + width: 100%; + padding: 0px; + border-radius: 0px; + box-shadow: none; +} --