Skip to content
Browse files

Merge branch 'master' into talmdal_dev

  • Loading branch information...
2 parents 14683ec + b2f7f80 commit 357d20a6800d75c266ebe4281ebdd08e88a6e13a @talmdal talmdal committed
Showing with 78 additions and 59 deletions.
  1. BIN lib/flowplayer.controls.swf
  2. BIN lib/flowplayer.h264streaming.swf
  3. +1 −1 lib/flowplayer.js
  4. BIN lib/flowplayer.pseudostreaming.swf
  5. BIN lib/flowplayer.swf
  6. +4 −4 lib/yui/base-min.css
  7. +4 −4 lib/yui/reset-fonts-grids.css
  8. +1 −0 modules/akismet/controllers/admin_akismet.php
  9. +1 −0 modules/comment/controllers/admin_comments.php
  10. +1 −1 modules/comment/css/comment.css
  11. +5 −4 modules/comment/js/comment.js
  12. +39 −38 modules/comment/views/comments.html.php
  13. +1 −0 modules/digibug/controllers/admin_digibug.php
  14. +1 −1 modules/digibug/views/admin_digibug.html.php
  15. +1 −0 modules/g2_import/controllers/admin_g2_import.php
  16. +1 −0 modules/gallery/controllers/admin_advanced_settings.php
  17. +1 −0 modules/gallery/controllers/admin_dashboard.php
  18. +1 −0 modules/gallery/controllers/admin_graphics.php
  19. +1 −0 modules/gallery/controllers/admin_languages.php
  20. +1 −0 modules/gallery/controllers/admin_modules.php
  21. +1 −0 modules/gallery/controllers/admin_sidebar.php
  22. +1 −0 modules/gallery/controllers/admin_theme_options.php
  23. +1 −0 modules/gallery/controllers/admin_themes.php
  24. +0 −1 modules/gallery/tests/Item_Model_Test.php
  25. +4 −3 modules/gallery/views/movieplayer.html.php
  26. +1 −0 modules/recaptcha/controllers/admin_recaptcha.php
  27. +1 −0 modules/server_add/controllers/admin_server_add.php
  28. +1 −0 modules/tag/controllers/admin_tags.php
  29. +1 −1 modules/tag/helpers/tag.php
  30. +1 −1 modules/tag/views/admin_tags.html.php
  31. +1 −0 modules/user/controllers/admin_users.php
  32. +1 −0 modules/watermark/controllers/admin_watermarks.php
View
BIN lib/flowplayer.controls.swf
Binary file not shown.
View
BIN lib/flowplayer.h264streaming.swf
Binary file not shown.
View
2 lib/flowplayer.js
@@ -51,7 +51,7 @@ return playlist[index];},getCommonClip:function(){return commonClip;},getPlaylis
return plugin;},getScreen:function(){return self.getPlugin("screen");},getControls:function(){return self.getPlugin("controls");},getConfig:function(copy){return copy?clone(conf):conf;},getFlashParams:function(){return params;},loadPlugin:function(name,url,props,fn){if(typeof props=='function'){fn=props;props={};}
var fnId=fn?makeId():"_";self._api().fp_loadPlugin(name,url,props,fnId);var arg={};arg[fnId]=fn;var p=new Plugin(name,null,self,arg);plugins[name]=p;return p;},getState:function(){return api?api.fp_getState():-1;},play:function(clip,instream){function play(){if(clip!==undefined){self._api().fp_play(clip,instream);}else{self._api().fp_play();}}
if(api){play();}else{self.load(function(){play();});}
-return self;},getVersion:function(){var js="flowplayer.js @VERSION";if(api){var ver=api.fp_getVersion();ver.push(js);return ver;}
+return self;},getVersion:function(){var js="flowplayer.js 3.1.4";if(api){var ver=api.fp_getVersion();ver.push(js);return ver;}
return js;},_api:function(){if(!api){throw"Flowplayer "+self.id()+" not loaded when calling an API method";}
return api;},setClip:function(clip){self.setPlaylist([clip]);return self;},getIndex:function(){return playerIndex;}});each(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var name="on"+this;if(name.indexOf("*")!=-1){name=name.substring(0,name.length-1);var name2="onBefore"+name.substring(2);self[name2]=function(fn){bind(listeners,name2,fn);return self;};}
self[name]=function(fn){bind(listeners,name,fn);return self;};});each(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed").split(","),function(){var name=this;self[name]=function(a1,a2){if(!api){return self;}
View
BIN lib/flowplayer.pseudostreaming.swf
Binary file not shown.
View
BIN lib/flowplayer.swf
Binary file not shown.
View
8 lib/yui/base-min.css
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
+http://developer.yahoo.com/yui/license.html
+version: 2.8.1
*/
-h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:bold;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;} em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:bold;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;*width:11.9em;}
+body{margin:10px;}h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong,dt{font-weight:bold;}optgroup{font-weight:normal;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}del{text-decoration:line-through;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:bold;text-align:center;}caption{margin-bottom:.5em;text-align:center;}sup{vertical-align:super;}sub{vertical-align:sub;}p,fieldset,table,pre{margin-bottom:1em;}button,input[type="checkbox"],input[type="radio"],input[type="reset"],input[type="submit"]{padding:1px;}
View
8 lib/yui/reset-fonts-grids.css
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
+http://developer.yahoo.com/yui/license.html
+version: 2.8.1
*/
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}del,ins{text-decoration:none;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}body{text-align:center;}#ft{clear:both;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}#doc2{width:73.076em;*width:71.25em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.05em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main,.yui-g .yui-u .yui-g{width:100%;}{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.30769em;*width:12.00em;}.yui-t1 #yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}.yui-t2 .yui-b{float:left;width:13.8461em;*width:13.50em;}.yui-t2 #yui-main .yui-b{margin-left:14.8461em;*margin-left:14.55em;}.yui-t3 .yui-b{float:left;width:23.0769em;*width:22.50em;}.yui-t3 #yui-main .yui-b{margin-left:24.0769em;*margin-left:23.62em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.50em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.55em;}.yui-t5 .yui-b{float:right;width:18.4615em;*width:18.00em;}.yui-t5 #yui-main .yui-b{margin-right:19.4615em;*margin-right:19.125em;}.yui-t6 .yui-b{float:right;width:23.0769em;*width:22.50em;}.yui-t6 #yui-main .yui-b{margin-right:24.0769em;*margin-right:23.62em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;}.yui-g div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.yui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.first{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{width:32%;margin-left:1.99%;}.yui-gb .yui-u{*margin-left:1.9%;*width:31.9%;}.yui-gc div.first,.yui-gd .yui-u{width:66%;}.yui-gd div.first{width:32%;}.yui-ge div.first,.yui-gf .yui-u{width:74.2%;}.yui-ge .yui-u,.yui-gf div.first{width:24%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:49%;*width:48.1%;*margin-left:0;}.yui-g .yui-g .yui-u{width:48.1%;}.yui-g .yui-gb div.first,.yui-gb .yui-gb div.first{*margin-right:0;*width:32%;_width:31.7%;}.yui-g .yui-gc div.first,.yui-gd .yui-g{width:66%;}.yui-gb .yui-g div.first{*margin-right:4%;_margin-right:1.3%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{*margin-left:1.8%;_margin-left:4%;}.yui-g .yui-gb .yui-u{_margin-left:1.0%;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{width:32%;_float:right;margin-right:0;_margin-left:0;}.yui-gb .yui-gc div.first{width:66%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{*width:48.1%;*margin-left:0;} .yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-g{width:24%;}.yui-gf .yui-g{width:74.2%;}.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{float:right;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{float:left;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}.yui-ge div.first .yui-gd .yui-u{width:65%;}.yui-ge div.first .yui-gd div.first{width:32%;}#bd:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#bd,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}body{text-align:center;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;}#doc2{width:73.076em;*width:71.25em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.05em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main,.yui-g .yui-u .yui-g{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.30769em;*width:12.00em;}.yui-t1 #yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}.yui-t2 .yui-b{float:left;width:13.8461em;*width:13.50em;}.yui-t2 #yui-main .yui-b{margin-left:14.8461em;*margin-left:14.55em;}.yui-t3 .yui-b{float:left;width:23.0769em;*width:22.50em;}.yui-t3 #yui-main .yui-b{margin-left:24.0769em;*margin-left:23.62em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.50em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.55em;}.yui-t5 .yui-b{float:right;width:18.4615em;*width:18.00em;}.yui-t5 #yui-main .yui-b{margin-right:19.4615em;*margin-right:19.125em;}.yui-t6 .yui-b{float:right;width:23.0769em;*width:22.50em;}.yui-t6 #yui-main .yui-b{margin-right:24.0769em;*margin-right:23.62em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;}.yui-g div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.yui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.first{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{width:32%;margin-left:1.99%;}.yui-gb .yui-u{*margin-left:1.9%;*width:31.9%;}.yui-gc div.first,.yui-gd .yui-u{width:66%;}.yui-gd div.first{width:32%;}.yui-ge div.first,.yui-gf .yui-u{width:74.2%;}.yui-ge .yui-u,.yui-gf div.first{width:24%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:49%;*width:48.1%;*margin-left:0;}.yui-g .yui-g .yui-u{width:48.1%;}.yui-g .yui-gb div.first,.yui-gb .yui-gb div.first{*margin-right:0;*width:32%;_width:31.7%;}.yui-g .yui-gc div.first,.yui-gd .yui-g{width:66%;}.yui-gb .yui-g div.first{*margin-right:4%;_margin-right:1.3%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{*margin-left:1.8%;_margin-left:4%;}.yui-g .yui-gb .yui-u{_margin-left:1.0%;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{width:32%;_float:right;margin-right:0;_margin-left:0;}.yui-gb .yui-gc div.first{width:66%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{*width:48.1%;*margin-left:0;}.yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-g{width:24%;}.yui-gf .yui-g{width:74.2%;}.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{float:right;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{float:left;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}.yui-ge div.first .yui-gd .yui-u{width:65%;}.yui-ge div.first .yui-gd div.first{width:32%;}#hd:after,#bd:after,#ft:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#hd,#bd,#ft,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
View
1 modules/akismet/controllers/admin_akismet.php
@@ -50,6 +50,7 @@ public function index() {
akismet::check_config();
$view = new Admin_View("admin.html");
+ $view->page_title = t("Akismet spam filtering");
$view->content = new View("admin_akismet.html");
$view->content->valid_key = $valid_key;
$view->content->form = $form;
View
1 modules/comment/controllers/admin_comments.php
@@ -44,6 +44,7 @@ public function queue($state) {
$page = max(Input::instance()->get("page"), 1);
$view = new Admin_View("admin.html");
+ $view->page_title = t("Manage comments");
$view->content = new View("admin_comments.html");
$view->content->counts = $this->_counts();
$view->content->menu = $this->_menu($view->content->counts);
View
2 modules/comment/css/comment.css
@@ -28,7 +28,7 @@
width: 32px;
}
-#g-admin-comment-button {
+#g-add-comment {
position: absolute;
right: 0;
top: 2px;
View
9 modules/comment/js/comment.js
@@ -1,5 +1,5 @@
$("document").ready(function() {
- $("#g-admin-comment-button").click(function(event) {
+ $("#g-add-comment").click(function(event) {
event.preventDefault();
if (!$("#g-comment-form").length) {
$.get($(this).attr("href"),
@@ -7,10 +7,11 @@ $("document").ready(function() {
function(data) {
$("#g-comment-detail").append(data);
ajaxify_comment_form();
+ $.scrollTo("#g-comment-form-anchor", 800);
});
}
});
- $("#g-no-comments").click(function(event) {
+ $(".g-no-comments a").click(function(event) {
event.preventDefault();
if (!$("#g-comment-form").length) {
$.get($(this).attr("href"),
@@ -19,7 +20,7 @@ $("document").ready(function() {
$("#g-comment-detail").append(data);
ajaxify_comment_form();
});
- $("#g-no-comments-yet").remove();
+ $(".g-no-comments").remove();
}
});
});
@@ -32,7 +33,7 @@ function ajaxify_comment_form() {
$("#g-comments #g-comment-detail ul").append(data.view);
$("#g-comments #g-comment-detail ul li:last").effect("highlight", {color: "#cfc"}, 8000);
$("#g-comment-form").hide(2000).remove();
- $("#g-no-comments-yet").hide(2000);
+ $("#g-no-comments").hide(2000);
} else {
if (data.form) {
$("#g-comments form").replaceWith(data.form);
View
77 modules/comment/views/comments.html.php
@@ -1,45 +1,46 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
- <a href="<?= url::site("form/add/comments/{$item->id}") ?>" id="g-admin-comment-button"
+ <a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
class="g-button ui-corner-all ui-icon-left ui-state-default">
<span class="ui-icon ui-icon-comment"></span>
<?= t("Add a comment") ?>
</a>
<div id="g-comment-detail">
-<? if (!$comments->count()): ?>
-<p id="g-no-comments-yet">
- <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
- array("attrs" => html::mark_clean("id= \"g-no-comments\" href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
-</p>
-<ul>&nbsp;</ul>
-<? endif ?>
-<? if ($comments->count()): ?>
-<ul>
- <? foreach ($comments as $comment): ?>
- <li id="g-comment-<?= $comment->id ?>">
- <p class="g-author">
- <a href="#">
- <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
- class="g-avatar"
- alt="<?= html::clean_attribute($comment->author_name()) ?>"
- width="40"
- height="40" />
- </a>
- <? if ($comment->author()->guest): ?>
- <?= t('on %date %name said',
- array("date" => date("Y-M-d H:i:s", $comment->created),
- "name" => html::clean($comment->author_name()))); ?>
- <? else: ?>
- <?= t('on %date <a href="%url">%name</a> said',
- array("date" => date("Y-M-d H:i:s", $comment->created),
- "url" => user_profile::url($comment->author_id),
- "name" => html::clean($comment->author_name()))); ?>
- <? endif ?>
- </p>
- <div>
- <?= nl2br(html::purify($comment->text)) ?>
- </div>
- </li>
- <? endforeach ?>
-</ul>
-<? endif ?>
+ <? if (!$comments->count()): ?>
+ <p class="g-no-comments">
+ <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
+ array("attrs" => html::mark_clean("href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
+ </p>
+ <ul><li class="g-no-comments">&nbsp;</li></ul>
+ <? endif ?>
+ <? if ($comments->count()): ?>
+ <ul>
+ <? foreach ($comments as $comment): ?>
+ <li id="g-comment-<?= $comment->id ?>">
+ <p class="g-author">
+ <a href="#">
+ <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+ class="g-avatar"
+ alt="<?= html::clean_attribute($comment->author_name()) ?>"
+ width="40"
+ height="40" />
+ </a>
+ <? if ($comment->author()->guest): ?>
+ <?= t('on %date %name said',
+ array("date" => date("Y-M-d H:i:s", $comment->created),
+ "name" => html::clean($comment->author_name()))); ?>
+ <? else: ?>
+ <?= t('on %date <a href="%url">%name</a> said',
+ array("date" => date("Y-M-d H:i:s", $comment->created),
+ "url" => user_profile::url($comment->author_id),
+ "name" => html::clean($comment->author_name()))); ?>
+ <? endif ?>
+ </p>
+ <div>
+ <?= nl2br(html::purify($comment->text)) ?>
+ </div>
+ </li>
+ <? endforeach ?>
+ </ul>
+ <? endif ?>
+ <a name="comment-form" id="g-comment-form-anchor"></a>
</div>
View
1 modules/digibug/controllers/admin_digibug.php
@@ -20,6 +20,7 @@
class Admin_Digibug_Controller extends Admin_Controller {
public function index() {
$v = new Admin_View("admin.html");
+ $v->page_title = t("Digibug");
$v->content = new View("admin_digibug.html");
print $v;
}
View
2 modules/digibug/views/admin_digibug.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div class="g-block">
<img src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>" alt="Digibug logo" class="g-right"/>
- <h1> <?= t("Digibug Photo Printing") ?> </h1>
+ <h1> <?= t("Digibug photo printing") ?> </h1>
<div class="g-block-content">
<p>
<?= t("Turn your photos into a wide variety of prints, gifts and games!") ?>
View
1 modules/g2_import/controllers/admin_g2_import.php
@@ -30,6 +30,7 @@ public function index() {
}
$view = new Admin_View("admin.html");
+ $view->page_title = t("Gallery 2 import");
$view->content = new View("admin_g2_import.html");
$view->content->form = $this->_get_import_form();
$view->content->version = '';
View
1 modules/gallery/controllers/admin_advanced_settings.php
@@ -20,6 +20,7 @@
class Admin_Advanced_Settings_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Advanced settings");
$view->content = new View("admin_advanced_settings.html");
$view->content->vars = ORM::factory("var")
->order_by("module_name")
View
1 modules/gallery/controllers/admin_dashboard.php
@@ -20,6 +20,7 @@
class Admin_Dashboard_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Dashboard");
$view->content = new View("admin_dashboard.html");
$view->content->blocks = block_manager::get_html("dashboard_center");
$view->sidebar = "<div id=\"g-admin-dashboard-sidebar\">" .
View
1 modules/gallery/controllers/admin_graphics.php
@@ -20,6 +20,7 @@
class Admin_Graphics_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Graphics settings");
$view->content = new View("admin_graphics.html");
$view->content->tk = graphics::detect_toolkits();
$view->content->active = module::get_var("gallery", "graphics_toolkit", "none");
View
1 modules/gallery/controllers/admin_languages.php
@@ -20,6 +20,7 @@
class Admin_Languages_Controller extends Admin_Controller {
public function index($share_translations_form=null) {
$v = new Admin_View("admin.html");
+ $v->page_title = t("Languages and translations");
$v->content = new View("admin_languages.html");
$v->content->available_locales = locales::available();
$v->content->installed_locales = locales::installed();
View
1 modules/gallery/controllers/admin_modules.php
@@ -20,6 +20,7 @@
class Admin_Modules_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Modules");
$view->content = new View("admin_modules.html");
$view->content->available = module::available();
print $view;
View
1 modules/gallery/controllers/admin_sidebar.php
@@ -20,6 +20,7 @@
class Admin_Sidebar_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Manage sidebar");
$view->content = new View("admin_sidebar.html");
$view->content->csrf = access::csrf_token();
$view->content->available = new View("admin_sidebar_blocks.html");
View
1 modules/gallery/controllers/admin_theme_options.php
@@ -20,6 +20,7 @@
class Admin_Theme_Options_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Theme options");
$view->content = new View("admin_theme_options.html");
$view->content->form = theme::get_edit_form_admin();
print $view;
View
1 modules/gallery/controllers/admin_themes.php
@@ -20,6 +20,7 @@
class Admin_Themes_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Theme choice");
$view->content = new View("admin_themes.html");
$view->content->admin = module::get_var("gallery", "active_admin_theme");
$view->content->site = module::get_var("gallery", "active_site_theme");
View
1 modules/gallery/tests/Item_Model_Test.php
@@ -295,7 +295,6 @@ public function basic_validation_test() {
} catch (ORM_Validation_Exception $e) {
$this->assert_same(array("description" => "length",
"name" => "required",
- "slug" => "required",
"title" => "required",
"album_cover_item_id" => "invalid_item",
"parent_id" => "invalid",
View
7 modules/gallery/views/movieplayer.html.php
@@ -5,12 +5,13 @@
"<?= $attrs["id"] ?>",
{
src: "<?= url::abs_file("lib/flowplayer.swf") ?>",
- wmode: "transparent"
+ wmode: "transparent",
+ provider: "pseudostreaming"
},
{
plugins: {
- h264streaming: {
- url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>"
+ pseudostreaming: {
+ url: "<?= url::abs_file("lib/flowplayer.pseudostreaming.swf") ?>"
},
controls: {
autoHide: 'always',
View
1 modules/recaptcha/controllers/admin_recaptcha.php
@@ -51,6 +51,7 @@ public function index() {
recaptcha::check_config();
$view = new Admin_View("admin.html");
+ $view->page_title = t("reCAPTCHA");
$view->content = new View("admin_recaptcha.html");
$view->content->public_key = module::get_var("recaptcha", "public_key");
$view->content->private_key = module::get_var("recaptcha", "private_key");
View
1 modules/server_add/controllers/admin_server_add.php
@@ -20,6 +20,7 @@
class Admin_Server_Add_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Add from server");
$view->content = new View("admin_server_add.html");
$view->content->form = $this->_get_admin_form();
$paths = unserialize(module::get_var("server_add", "authorized_paths", "a:0:{}"));
View
1 modules/tag/controllers/admin_tags.php
@@ -22,6 +22,7 @@ public function index() {
$filter = Input::instance()->get("filter");
$view = new Admin_View("admin.html");
+ $view->page_title = t("Manage tags");
$view->content = new View("admin_tags.html");
$view->content->filter = $filter;
View
2 modules/tag/helpers/tag.php
@@ -98,7 +98,7 @@ static function get_add_form($item) {
($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie"));
$group = $form->group("add_tag")->label("Add Tag");
- $group->input("name")->label($label)->rules("required");
+ $group->input("name")->label($label)->rules("required")->id("name");
$group->hidden("item_id")->value($item->id);
$group->submit("")->value(t("Add Tag"));
return $form;
View
2 modules/tag/views/admin_tags.html.php
@@ -16,7 +16,7 @@
<? $column_tag_count = 0 ?>
<div class="g-block">
- <h1> <?= t("Tag Admin") ?> </h1>
+ <h1> <?= t("Manage tags") ?> </h1>
<div class="g-block-content">
<table id="g-tag-admin">
View
1 modules/user/controllers/admin_users.php
@@ -20,6 +20,7 @@
class Admin_Users_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
+ $view->page_title = t("Users and groups");
$view->content = new View("admin_users.html");
$view->content->users = ORM::factory("user")->order_by("name", "ASC")->find_all();
$view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
View
1 modules/watermark/controllers/admin_watermarks.php
@@ -22,6 +22,7 @@ public function index() {
$name = module::get_var("watermark", "name");
$view = new Admin_View("admin.html");
+ $view->page_title = t("Watermarks");
$view->content = new View("admin_watermarks.html");
if ($name) {
$view->content->name = module::get_var("watermark", "name");

0 comments on commit 357d20a

Please sign in to comment.
Something went wrong with that request. Please try again.