From e8897c2b7e3a392f193e3e53dbbeb8178f5c2078 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Wed, 12 Dec 2012 12:55:29 +0100 Subject: prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup --- apps/files/js/keyboardshortcuts.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 562755f55b7..cc2b5d42139 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -127,6 +127,9 @@ var Files = Files || {}; } Files.bindKeyboardShortcuts = function(document, $) { $(document).keydown(function(event) { //check for modifier keys + if(!$(event.target).is('body')) { + return; + } var preventDefault = false; if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode); if ( -- cgit v1.2.3 From 4265419bbd1bae1fb62e7f07b6ef46cd60d1325f Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 12 Dec 2012 16:27:37 +0100 Subject: Try to fix #836 https://github.com/owncloud/core/issues/836 --- lib/MDB2/Driver/sqlite3.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index fa4c91c1269..9839dafbce1 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if ($this->connection) { $native_code = $this->connection->lastErrorCode(); } - $native_msg = $this->_lasterror - ? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg(); + $native_msg = html_entity_decode($this->_lasterror); // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. -- cgit v1.2.3 From f85106b6b5d2e37ebf4cb850a076c4bb67f2a735 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 12 Dec 2012 22:41:12 +0100 Subject: first version of the new documentation system integration. --- core/docu/admin/index.php | 1 + core/docu/user/index.php | 3 +++ settings/help.php | 22 +++++++++------- settings/templates/help.php | 62 +++++++++++++++++++++------------------------ 4 files changed, 46 insertions(+), 42 deletions(-) create mode 100644 core/docu/admin/index.php create mode 100644 core/docu/user/index.php diff --git a/core/docu/admin/index.php b/core/docu/admin/index.php new file mode 100644 index 00000000000..3f754998084 --- /dev/null +++ b/core/docu/admin/index.php @@ -0,0 +1 @@ +here goes the admin documentation diff --git a/core/docu/user/index.php b/core/docu/user/index.php new file mode 100644 index 00000000000..dc167c01bd9 --- /dev/null +++ b/core/docu/user/index.php @@ -0,0 +1,3 @@ +here goes the user documentation + + diff --git a/settings/help.php b/settings/help.php index 69a5ec9c146..6f99596b2ba 100644 --- a/settings/help.php +++ b/settings/help.php @@ -12,15 +12,19 @@ OC_App::loadApps(); OC_Util::addStyle( "settings", "settings" ); OC_App::setActiveNavigationEntry( "help" ); -$pagesize=7; -if(isset($_GET['page'])) $page=$_GET['page']; else $page=0; -$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize); -$totalitems=$kbe['totalitems']; -unset($kbe['totalitems']); -$pagecount=ceil($totalitems/$pagesize); + +if(isset($_GET['mode']) and $_GET['mode']=='admin') { + $url=OC_Helper::linkToAbsolute( 'core', 'docu/admin' ); +}else{ + $url=OC_Helper::linkToAbsolute( 'core', 'docu/user' ); +} + +$url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user'; +$url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin'; $tmpl = new OC_Template( "settings", "help", "user" ); -$tmpl->assign( "kbe", $kbe ); -$tmpl->assign( "pagecount", $pagecount ); -$tmpl->assign( "page", $page ); +$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') ); +$tmpl->assign( "url", $url ); +$tmpl->assign( "url1", $url1 ); +$tmpl->assign( "url2", $url2 ); $tmpl->printPage(); diff --git a/settings/templates/help.php b/settings/templates/help.php index 75201a86a9f..5ed99420cf4 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,34 +1,30 @@ - - - -
-

t('Problems connecting to help database.');?>

-

t('Go there manually.');?>

-
- - -
- "") echo(''); ?> - '') echo('

'.$kb["name"].'

');?> -

- '') echo('

'.$l->t('Answer').':

'.$kb['answer'].'

');?> -
- + t( 'User Documentation' ); ?> + t( 'Administrator Documentation' ); ?> + t( 'Online Documentation' ); ?> + t( 'Forum' ); ?> + t( 'Bugtracker' ); ?> + +

+ + + + -- cgit v1.2.3 From 89bbabd77bac2d21739b232e6315f2f09b9c9b56 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 13 Dec 2012 09:26:25 +0100 Subject: a bit more polish. We are getting there. --- settings/css/settings.css | 3 +++ settings/help.php | 6 ++++++ settings/templates/help.php | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/settings/css/settings.css b/settings/css/settings.css index 560862fa12f..36457481911 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -68,3 +68,6 @@ span.securitywarning {color:#C33; font-weight:bold; } span.connectionwarning {color:#933; font-weight:bold; } input[type=radio] { width:1em; } table.shareAPI td { padding-bottom: 0.8em; } + +/* HELP */ +.pressed {background-color:#DDD;} diff --git a/settings/help.php b/settings/help.php index 6f99596b2ba..cdf0c549e44 100644 --- a/settings/help.php +++ b/settings/help.php @@ -15,8 +15,12 @@ OC_App::setActiveNavigationEntry( "help" ); if(isset($_GET['mode']) and $_GET['mode']=='admin') { $url=OC_Helper::linkToAbsolute( 'core', 'docu/admin' ); + $style1=''; + $style2=' pressed'; }else{ $url=OC_Helper::linkToAbsolute( 'core', 'docu/user' ); + $style1=' pressed'; + $style2=''; } $url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user'; @@ -27,4 +31,6 @@ $tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') ); $tmpl->assign( "url", $url ); $tmpl->assign( "url1", $url1 ); $tmpl->assign( "url2", $url2 ); +$tmpl->assign( "style1", $style1 ); +$tmpl->assign( "style2", $style2 ); $tmpl->printPage(); diff --git a/settings/templates/help.php b/settings/templates/help.php index 5ed99420cf4..06f53746c29 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,9 +1,10 @@

-- cgit v1.2.3 From 2330d6bcc7a178d15b74eb8352f86e778afd717d Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 13 Dec 2012 11:08:12 +0100 Subject: show the link to the issue tracker only for Admins as discussed with Björn and Jan. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings/templates/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/templates/help.php b/settings/templates/help.php index 06f53746c29..473219024b7 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -3,7 +3,7 @@ t( 'Administrator Documentation' ); ?> t( 'Online Documentation' ); ?> t( 'Forum' ); ?> - t( 'Bugtracker' ); ?> + t( 'Bugtracker' ); ?> t( 'Commercial Support' ); ?>

-- cgit v1.2.3 From 316a29f7ac09d71cfedc4bea5be892b56e27433f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 13 Dec 2012 19:04:27 +0100 Subject: fix new button popup looking blurry --- apps/files/css/files.css | 8 ++++---- apps/files/templates/index.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index afc72916e09..59aa4dbf0fb 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -12,16 +12,16 @@ #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; } #new>a { padding:.5em 1.2em .3em; } #new>ul { - display:none; position:fixed; min-width:7em; z-index:-1; - padding:.5em; margin-top:0.075em; margin-left:-.5em; + display:none; position:fixed; min-width:7em; z-index:10; + padding:.5em; padding-bottom:0; margin-top:.075em; margin-left:-.5em; text-align:left; - background:#f8f8f8; border:1px solid #ddd; + background:#f8f8f8; border:1px solid #ddd; border-radius:10px; border-top-left-radius:0; + box-shadow:0 2px 7px rgba(170,170,170,.4); } #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em; background-repeat:no-repeat; cursor:pointer; } #new>ul>li>p { cursor:pointer; } #new>ul>li>input { padding:0.3em; margin:-0.3em; } -#new .popup { border-top-left-radius:0; z-index:10; } #upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index bd34c9a76d9..edf048c7e13 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -5,7 +5,7 @@
t('New');?> -