From 8cdc5c0224493584de8f8f58ef15e5ee7b5c0a9e Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 21 Apr 2011 15:51:29 +0200 Subject: [PATCH 1/6] Add german language pack --- application/libraries/MY_Form_validation.php | 42 +++++++++++++ system/language/german/calendar_lang.php | 50 ++++++++++++++++ system/language/german/date_lang.php | 59 +++++++++++++++++++ system/language/german/db_lang.php | 29 +++++++++ system/language/german/email_lang.php | 23 ++++++++ .../language/german/form_validation_lang.php | 27 +++++++++ system/language/german/ftp_lang.php | 17 ++++++ system/language/german/imglib_lang.php | 23 ++++++++ system/language/german/index.html | 10 ++++ system/language/german/number_lang.php | 10 ++++ system/language/german/profiler_lang.php | 22 +++++++ system/language/german/unit_test_lang.php | 24 ++++++++ system/language/german/upload_lang.php | 21 +++++++ 13 files changed, 357 insertions(+) create mode 100644 application/libraries/MY_Form_validation.php create mode 100755 system/language/german/calendar_lang.php create mode 100755 system/language/german/date_lang.php create mode 100755 system/language/german/db_lang.php create mode 100755 system/language/german/email_lang.php create mode 100755 system/language/german/form_validation_lang.php create mode 100755 system/language/german/ftp_lang.php create mode 100755 system/language/german/imglib_lang.php create mode 100755 system/language/german/index.html create mode 100755 system/language/german/number_lang.php create mode 100755 system/language/german/profiler_lang.php create mode 100755 system/language/german/unit_test_lang.php create mode 100755 system/language/german/upload_lang.php diff --git a/application/libraries/MY_Form_validation.php b/application/libraries/MY_Form_validation.php new file mode 100644 index 0000000..6ada3b0 --- /dev/null +++ b/application/libraries/MY_Form_validation.php @@ -0,0 +1,42 @@ + + */ +class MY_Form_validation extends CI_Form_validation { + + /** + * Calls the parent constructor. + */ + public function __construct() { + parent::__construct(); + } + + /** + * Checks if a username or email is unique. + * + * @param string $value + * @param string $params + */ + function unique($value, $params) { + $CI =& get_instance(); + + $CI->form_validation->set_message('unique', 'The %s is already being used.'); + + list($table, $field) = explode(".", $params, 2); + + $query = $CI->db->select($field)->from($table)->where($field, $value)->limit(1)->get(); + + if ($query->row()) { + return false; + } else { + return true; + } + } + +} + +/* End of file MY_Form_validation.php */ +/* Location: ./application/libraries/MY_Form_validation.php */ diff --git a/system/language/german/calendar_lang.php b/system/language/german/calendar_lang.php new file mode 100755 index 0000000..fc29ff4 --- /dev/null +++ b/system/language/german/calendar_lang.php @@ -0,0 +1,50 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + \ No newline at end of file diff --git a/system/language/german/number_lang.php b/system/language/german/number_lang.php new file mode 100755 index 0000000..83c6c45 --- /dev/null +++ b/system/language/german/number_lang.php @@ -0,0 +1,10 @@ + Date: Thu, 21 Apr 2011 15:53:01 +0200 Subject: [PATCH 2/6] Ignore all .xcf files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 38886f4..6f0d8d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ .project .settings/ .htaccess +*.xcf application/config/config.php application/config/database.php From 5e8408c2cb2def9ad17b2b4c6cc8d9679d4fe06e Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 21 Apr 2011 20:04:14 +0200 Subject: [PATCH 3/6] Fix project tree style --- application/controllers/projects.php | 19 +++++++++---------- application/views/header.php | 3 +++ application/views/index.php | 19 ++++++------------- assets/css/main.css | 8 ++++++++ assets/images/lang_de.png | Bin 0 -> 545 bytes assets/images/lang_us.png | Bin 0 -> 609 bytes assets/images/logo.png | Bin 1700 -> 2980 bytes 7 files changed, 26 insertions(+), 23 deletions(-) create mode 100755 assets/images/lang_de.png create mode 100755 assets/images/lang_us.png diff --git a/application/controllers/projects.php b/application/controllers/projects.php index 3f7e631..af91835 100644 --- a/application/controllers/projects.php +++ b/application/controllers/projects.php @@ -9,8 +9,7 @@ class Projects extends CI_Controller { $this->load->model('Project'); $path = $this->input->get_post('node'); - - + switch($path) { case '/projects/own': $projects = $this->Project->getOwn(); @@ -26,29 +25,29 @@ class Projects extends CI_Controller { array( 'id' => '/projects/own', 'cls' => 'folder', - 'text' => 'Eigene Projekte', - 'icon' => '/ScattPort/assets/images/icons/folder.png',), + 'text' => "Eigene Projekte", + 'icon' => base_url() . 'assets/images/icons/folder.png',), array( 'id' => '/projects/shared', 'cls' => 'leaf', - 'text' => 'Für mich freigegeben', - 'icon' => '/ScattPort/assets/images/icons/folder-share.png', + 'text' => "Für mich freigegeben", + 'icon' => base_url() . 'assets/images/icons/folder-share.png', ), array( 'id' => '/projects/public', 'cls' => 'folder', - 'text' => 'Öffentliche Projekte', - 'icon' => '/ScattPort/assets/images/icons/folder-network.png', + 'text' => "Öffentliche Projekte", + 'icon' => base_url() . 'assets/images/icons/folder-network.png', ), ); } - + $this->output ->set_content_type('application/json') ->set_output(json_encode($projects)); // ->set_output(json_encode(array('count' => $count, 'projects' => $projects))); } - + public function detail($projects, $area, $id) { $result = $this->db->get_where('projects', array('id' => $id))->row_array(); $this->output diff --git a/application/views/header.php b/application/views/header.php index c7578da..eb12c08 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -17,6 +17,8 @@ $(document).ready(function() { Ext.QuickTips.init(); + + }); @@ -29,4 +31,5 @@ 'padding: 5px;'));?> | 'padding: 5px;'));?> + 'assets/images/lang_de.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?> diff --git a/application/views/index.php b/application/views/index.php index 8dc3d8a..05eaaa0 100644 --- a/application/views/index.php +++ b/application/views/index.php @@ -9,6 +9,8 @@ var projectTree = new Ext.tree.TreePanel({ autoScroll: true, enableDD: false, rootVisible: false, + lines: false, + useArrows: true, id: 'treePanel', tbar: [{ icon: BASE_PATH + 'assets/images/icons/box--plus.png', @@ -31,15 +33,6 @@ var projectTree = new Ext.tree.TreePanel({ projectTree.on('click', loadProjectInfo); -var infoPanel = new Ext.Panel({ - region: 'west', - margin: '10 0 0 0', - autoScroll: true, - bodyStyle: 'padding: 10px; background: #eee;', - html: 'Test' -}); - - var tabPanel = new Ext.TabPanel({ xtype: 'tabpanel', resizeTabs: false, @@ -108,9 +101,9 @@ function loadProjectInfo(n) { url: BASE_URL + 'projects/detail' + n.id, method: 'get', success: function ( result, request ) { - + var theResponse = Ext.util.JSON.decode(result.responseText); - + tabPanel.add({ title: 'New Tab ', html: 'Lade Projekt...', @@ -122,7 +115,7 @@ function loadProjectInfo(n) { '

ID: {id}

', '

Name: {name}

' ); - + tpl.overwrite(this.html, data); } }).show(); @@ -140,7 +133,7 @@ function loadProjectInfo(n) { } } }); - + } } diff --git a/assets/css/main.css b/assets/css/main.css index 432b250..15631ae 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -28,3 +28,11 @@ a:hover { .x-viewport body { background: #ededed url('../images/back.png') repeat-x !important; } + +.x-tree-node { + padding: 2px; +} + +.x-tree-node-icon { + height: 16px !important; +} diff --git a/assets/images/lang_de.png b/assets/images/lang_de.png new file mode 100755 index 0000000000000000000000000000000000000000..ac4a977362738ca7daa20784717f10f9617136b4 GIT binary patch literal 545 zcmV++0^a?JP)h<6BFn%a z@b8~2SoNP@zd$;E{sbbRuHQd?{QCI=sNwhbA3*&Qe}GP900=;09NYi^fU@pUdVa9*13;+Sd!tjgXKhXQEMobL97(p6<{RLvMGBN!7 j!N9=G@a-1^K!5=NcXWu!7_DDe00000NkvXXu0mjfeQx^H literal 0 HcmV?d00001 diff --git a/assets/images/lang_us.png b/assets/images/lang_us.png new file mode 100755 index 0000000000000000000000000000000000000000..10f451fe85c41c6c9a06d543a57114ae2f87ecc1 GIT binary patch literal 609 zcmV-n0-pVeP){qW|y?pud`Sa)3|NY&vWd%S0u>b>P!2!lUe;6EF*#G_c zFVXVt@6Q{uX@40W{p0iY2Aa+A^Cu7i8KT+YH}2j52q4BskM2rJ$^k9;2Xxc_|Np=M z&VaLlA*IO5FlECMfB<5VUNC{tBZO(|zW*;@GJN;|bTJ71`0*d;`d`2P!x=ymOA`2> z+y@9C##^^8%gd{MW@Y91_2d742B2~OQNf=-zkmD?Vqkdk_wPTUNeuu2#KPTG{_;O4 v7C%8E5*DLB7#Kb?Fnj}}-(W6879hX?8lYRg`Y`<~00000NkvXXu0mjfD6Jtx literal 0 HcmV?d00001 diff --git a/assets/images/logo.png b/assets/images/logo.png index b626fc481ef25bf61cea89fa7c0cc7514505b1e3..397e5f2f48c611de36637ed7e2b17cc340a2f9f6 100644 GIT binary patch delta 2874 zcmZ{mX*kpi8;57HWv3`h(h!AEYO<3;$9hVZvQ1$^Ok49Qe*^sEe^=LwuaW$HkCF7{uO9;09?z-JNw8I*5C)tN z@u1EWipd(cz+j@P4h4H|?!p?9e|p0M1_`Z?NofkEI7HQ8e84f(KFf#>`tX_J+da(1 zP4oiEM1JUO-IJs@kqc&wD}Zr73}zb$%0q87<4$!_7W3y-fZ1Y_6mjsRQ_$E3cNb(K zvhM==F#2%rV04;%=32RSdGD{iAKUZ0`msSDH+PNUUt8;Eo#F6Xg&tv3Yu<+q3#%Y{VB6YiM>+Jd-*JZu zsOM==S}ndwYL)`3k-an*r@M!5wLH@F1I2!y$SrJyY(VNk-fMC)S#hGOq{($;eFG=< zSBAFcZshLgNg&f6`Bo5WBYi+pBcS*gc{FQ++ht#_!cXLuW>XtqSM=SGv}KMz`_+K|Ygo8{ z__(el$qOE^CPz}9+-taKoVYB!i5m(2fxSO`KibC<@PoDQgEp$%?Y^c~iAUR+bcVaC zN0Xr%(7kvD9!y*8s=E-cB*~*F$?cQexx$h;iay9K*dtedenw7K=7aqw$jo~ioYD1N z1(GDO;8HPF+SGLUVXI$gs2DwNf>t0`Ys$wR){7nMDqC`NFyp=MZfUw}1pGZ#AEx6A zJT%40dq6fZ*mEUXfiC{}jLhfsphBYar@!~>erp#^pjlwQr6g)}SW)eJ#ICzK=4q7= z54nofE#4UA51ZZHUn=gY_=iI+7G?vQ3>_|nWvCf@d^YR4888?;RCM}7h>&a|cTzMy|%}qR-crS9{ z*=@T1kSjRviLIYE@W=Ld4cYY*H9^k;#_s}0(F7e0)yLhRzC1z1Ir>%6q#nEr)1ekc zIjb{~GE!rR8i`F}OOLL)km=)tri%EAtl6Km-mHzu!;F)Lnkfq?CC6eR2z6kbx!b&W zydH%U?ln=GiO6eBXkMp}uz490jjvz~+5F39o-yjUvc>#egv;I&w4OFR%jkQvFwU@1gg zz}qa%5l@LootQfj32_CCk(3Cu8geEIcz3Tth_MT!CMgj`-E2Aee**Tup-Fhs{>Ee&*eX0V>?k0DP{Xc4`k=zD?&d~lzmQiMwT zTHSVorHzYzN8SGCW7<=`lnub7ElDEkl7?GjDc zkf@UpZo}N&F(Eh{Y5WA+cJmYlRqBUF$(F@ri5t}thlt~N5hDtf(Mq99-cS`xpV)9k0y>j@0Zo!l4@lU>SQ zuEJ(5R*)^R&TQn)X0cN<>RrXLlB(q7NMk%mV03Y!r&cMKd1tD+;#DgQC@Uwk+*)v} zE2{a#@s7&V@W7c!K^17-xaDQ3U17tc;ZeUXv2O3C44(tXesWt4f&5e$MeXP6?HC%< zewaGMe6Y!{SnG?~1I)3#CaXEQ<580)9`C7hBOyT|T*ZnQa{3$a`thczP7_|^=TrJ> z>;LwzEdBa2g?<;JKWf&15<=!}kPzJxJHSN9ds?@7s{@2y(I4?Dgz@gH91aY288}?|cp3MD*uvc{w{OhxF-OmE{T?V=l=)`< zjBCoyiQ+&WIo0{gHYr{&V}_EaD3q5U?2G4RGtDNOx$$QIv^O-U`$T>uho&k*R}-hV zf2oyvV;x14SHAUvV|+(5*YxTuhBoY9(EPvLx9%6%o^;?v0^F+x^cTNbJ6)`_LL~eb DdD*Ox delta 1584 zcmV-02G9AV7o-i4Ua1_I{+cL9rm)$w>2cp8`i^l!rZ9tPaHk!dOg#~;A=!27@rz;1o? zIR^pP_?Sv+He-Od8dRhe;B(-xCb{Q+z)aw$cyHZJlLnAAF>QMM0<-;=qo?xslt$ms=X_69yoS|t;D@w1*@;xkB6 z-EYyG(wV>x$?FGzQ-JMb%j68;jpY1}H10C$4cqllnzEJxhXN~rZGa1XG$n26-budQ zew34DcVJzTZdnuD_v0m67iH3vZGlwXAJe{P3q;bEZdFn_{SJ)GNjDp~H-8@YP=7%E zWMF;_M1KOyfknXCz<`2#*d4e7_yG77_?IyDumrdf7?M-r=N)C!bSHpZko;R^Z3UbI zEQ~Fc-+(PT->^*OSTuM)KgrjgsbDMdz3NdmO;-a*OKeqDfV(s2=Ee8h zVk=}=Y;_$HTV$2kA{kW>Kq|mo!r0Tcz=`p^U09Nu)@>!evHue*@qg^V^x>IGenGCSuxFC@;!GJ=#OrSdOpV{ftLMJUl-rwQAT7YLY#1;4joOI^CneW7rcVAL zgta7<7;N*(|2C(UW&n}Y)TSrju8WSPz|Kj&hm&*bfN`1Y9!VI_c$Kh7asT98{}@nC z0nV>;Pm7XkxAj5*seiW)B-=vz0hp4>KPR4BTu{dBBoOz{DSvKGUIU1vrq>Uc2;5Fs zG?*7ezGK7qNNe)`l8r2Xn;3Ae1YU}jZC(J_6al2((FS}1yZ~GW46T#@&6xJ)f-=S@ z*W4qg{A&#$lKwA717`s**Qr>mEs531d(U>GjKPGitOe8#I)67B`0lG|y!BLPvdt<; z(~^`kC8zwe4Iq+w(tu5P?LC0KVxSle+z0%eoL@;89G(YU8e1k+N6~pL#NaNLKOzR5 ziOGB45T?PtPS}6zxXq;H*2vb$@9T5Ytn+b~w7CS3)2Qus84g^QllI9>0I80Hd`VcL z4KOw*?{q@9*MDb(^$k_mC&8nGFs1kPPWy3*=KbSdp1Yt}11G<<7Hhv7`_~aUs>zp47 z{20$apA#U8%0D$pGtkFYQnT2HFw>~spmn`PeI3B%nQP1~nfK{TzGo=E3vdP4HOYHb z&b?LGuzyyiOq!kuAOJ5?yO6MjFkScH7?dl7@tvKz5kMvnzg0Ju*A=@687Gz2G}-g7cxpxpBez13p_>G=V>)z#ea1xVT{1j;@5=r z9McKiW%Y~&9*P01ov@$OEwS5YP^J=oB$IbM@El=)er?P Date: Thu, 21 Apr 2011 20:44:22 +0200 Subject: [PATCH 4/6] Better fix of project tree --- assets/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/main.css b/assets/css/main.css index 15631ae..05db6be 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -29,7 +29,7 @@ a:hover { background: #ededed url('../images/back.png') repeat-x !important; } -.x-tree-node { +.x-tree-node-el { padding: 2px; } From c4c7988b5d451d6f0596d3b6b7a8549c23c8584c Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 21 Apr 2011 20:45:38 +0200 Subject: [PATCH 5/6] Add helper for tree views and use it --- application/controllers/projects.php | 12 ++++++++---- application/helpers/tree_helper.php | 9 +++++++++ application/models/project.php | 17 +++++++---------- 3 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 application/helpers/tree_helper.php diff --git a/application/controllers/projects.php b/application/controllers/projects.php index af91835..e81c329 100644 --- a/application/controllers/projects.php +++ b/application/controllers/projects.php @@ -6,19 +6,23 @@ class Projects extends CI_Controller { * List all projects the user has access to. */ public function getAvailable() { - $this->load->model('Project'); + $this->load->model('project'); + $this->load->helper('tree'); $path = $this->input->get_post('node'); switch($path) { case '/projects/own': - $projects = $this->Project->getOwn(); + $projects = $this->project->getOwn(); + array_walk($projects, 'set_tree_icons', base_url() . 'assets/images/icons/document.png'); break; case '/projects/shared': - $projects = $this->Project->getShared(); + $projects = $this->project->getShared(); + array_walk($projects, 'set_tree_icons', base_url() . 'assets/images/icons/document.png'); break; case '/projects/public': - $projects = $this->Project->getPublic(); + $projects = $this->project->getPublic(); + array_walk($projects, 'set_tree_icons', base_url() . 'assets/images/icons/document.png'); break; default: $projects = array( diff --git a/application/helpers/tree_helper.php b/application/helpers/tree_helper.php new file mode 100644 index 0000000..f28808d --- /dev/null +++ b/application/helpers/tree_helper.php @@ -0,0 +1,9 @@ +db->where(array('owner' => '215cd70f310ae6ae')) ->order_by('lastaccess', 'desc') @@ -15,18 +15,17 @@ class Project extends CI_Model { $ownProjects[$i]['cls'] = 'folder'; $ownProjects[$i]['text'] = $project['name']; $ownProjects[$i]['leaf'] = true; - $ownProjects[$i]['icon'] = "/ScattPort/assets/images/icons/document.png"; $i++; } - + return $ownProjects; } - + public function getShared() { $this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => '215cd70f310ae6ae')); $this->db->join('projects', 'projects.id = shares.project_id'); $query = $this->db->get(); - + $projects = $query->result_array(); $sharedCount = $query->num_rows(); @@ -36,13 +35,12 @@ class Project extends CI_Model { $sharedProjects[$i]['cls'] = 'folder'; $sharedProjects[$i]['text'] = $project['name']; $sharedProjects[$i]['leaf'] = true; - $sharedProjects[$i]['icon'] = "/ScattPort/assets/images/icons/document.png"; $i++; } - + return $sharedProjects; } - + public function getPublic() { $query = $this->db->where(array('public' => '1')) ->order_by('name', 'asc') @@ -56,10 +54,9 @@ class Project extends CI_Model { $publicProjects[$i]['cls'] = 'folder'; $publicProjects[$i]['text'] = $project['name']; $publicProjects[$i]['leaf'] = true; - $publicProjects[$i]['icon'] = "/ScattPort/assets/images/icons/document.png"; $i++; } - + return $publicProjects; } } \ No newline at end of file From bc67619ce2bc0fb259fd1ee193e0da90272360e5 Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 21 Apr 2011 21:46:47 +0200 Subject: [PATCH 6/6] Add language support for projects controller --- application/config/autoload.php | 2 +- application/controllers/projects.php | 23 +++++++++++++------ .../language/english/projects_lang.php | 11 +++++++++ application/language/german/index.html | 10 ++++++++ application/language/german/projects_lang.php | 11 +++++++++ 5 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 application/language/english/projects_lang.php create mode 100755 application/language/german/index.html create mode 100644 application/language/german/projects_lang.php diff --git a/application/config/autoload.php b/application/config/autoload.php index 6c96dc7..9791f0a 100755 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -64,7 +64,7 @@ $autoload['libraries'] = array('database','session'); | $autoload['helper'] = array('url', 'file'); */ -$autoload['helper'] = array('url', 'html', 'script'); +$autoload['helper'] = array('url', 'html', 'script', 'language'); /* diff --git a/application/controllers/projects.php b/application/controllers/projects.php index e81c329..7687493 100644 --- a/application/controllers/projects.php +++ b/application/controllers/projects.php @@ -2,13 +2,22 @@ class Projects extends CI_Controller { + /** + * Constructor. + */ + public function __construct() { + parent::__construct(); + $this->load->model('project'); + $this->load->helper('tree'); + + // load language file + $this->lang->load(strtolower($this->router->class)); + } + /** - * List all projects the user has access to. + * Lists all projects the user has access to. */ public function getAvailable() { - $this->load->model('project'); - $this->load->helper('tree'); - $path = $this->input->get_post('node'); switch($path) { @@ -29,18 +38,18 @@ class Projects extends CI_Controller { array( 'id' => '/projects/own', 'cls' => 'folder', - 'text' => "Eigene Projekte", + 'text' => lang('projects_own'), 'icon' => base_url() . 'assets/images/icons/folder.png',), array( 'id' => '/projects/shared', 'cls' => 'leaf', - 'text' => "Für mich freigegeben", + 'text' => lang('projects_shared'), 'icon' => base_url() . 'assets/images/icons/folder-share.png', ), array( 'id' => '/projects/public', 'cls' => 'folder', - 'text' => "Öffentliche Projekte", + 'text' => lang('projects_public'), 'icon' => base_url() . 'assets/images/icons/folder-network.png', ), ); diff --git a/application/language/english/projects_lang.php b/application/language/english/projects_lang.php new file mode 100644 index 0000000..3ac6024 --- /dev/null +++ b/application/language/english/projects_lang.php @@ -0,0 +1,11 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + \ No newline at end of file diff --git a/application/language/german/projects_lang.php b/application/language/german/projects_lang.php new file mode 100644 index 0000000..f14197b --- /dev/null +++ b/application/language/german/projects_lang.php @@ -0,0 +1,11 @@ +