creylopez
/
phpsqlitecms
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Bootstrap update to version 3.0.2

pull/2/head
Mark (ilosuna) 12 years ago
parent
e0bbccde76
commit
0549ab7439
10 changed files with 46 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      cms/data/content.sqlite
  2. BIN
      cms/data/entries.sqlite
  3. BIN
      cms/data/userdata.sqlite
  4. +12
    -10
      cms/includes/functions.inc.php
  5. +2
    -2
      cms/lang/english.page.lang.php
  6. +2
    -2
      cms/templates/admin/main.tpl
  7. +5
    -5
      cms/templates/default.tpl
  8. +10
    -10
      cms/templates/subtemplates/notes.inc.tpl
  9. +9
    -9
      index.php
  10. +6
    -4
      static/css/style.css

BIN
cms/data/content.sqlite View File


BIN
cms/data/entries.sqlite View File


BIN
cms/data/userdata.sqlite View File


+ 12
- 10
cms/includes/functions.inc.php View File

@ -5,6 +5,7 @@ function __autoload($class_name)
require_once(BASE_PATH.'cms/includes/classes/'.$class_name.'.class.php'); require_once(BASE_PATH.'cms/includes/classes/'.$class_name.'.class.php');
} }
/*
if(get_magic_quotes_gpc()) if(get_magic_quotes_gpc())
{ {
function stripslashes_deep($value) function stripslashes_deep($value)
@ -17,6 +18,7 @@ if(get_magic_quotes_gpc())
$_COOKIE = array_map('stripslashes_deep', $_COOKIE); $_COOKIE = array_map('stripslashes_deep', $_COOKIE);
$_REQUEST = array_map('stripslashes_deep', $_REQUEST); $_REQUEST = array_map('stripslashes_deep', $_REQUEST);
} }
*/
function showme($what) function showme($what)
{ {
@ -998,20 +1000,20 @@ function raise_error($error,$error_message='')
else $message = 'The server is currently unable to handle the request.'; else $message = 'The server is currently unable to handle the request.';
break; break;
} }
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>">
?><!DOCTYPE html>
<html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?php echo $website_title.' - '.$title; ?></title> <title><?php echo $website_title.' - '.$title; ?></title>
<meta http-equiv="content-type" content="text/html; charset=<?php echo $charset; ?>" /> <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset; ?>" />
<style type="text/css"> <style type="text/css">
<!--
body { color:#000; background:#fff; margin:0; padding:0; font-family: verdana, arial, sans-serif; font-size:100.1%; }
h1 { font-size:1.25em; }
p,ul { font-size:0.82em; line-height:1.45em; }
#top { margin:0; padding:0 20px 0 20px; height:4em; color:#000000; background:#d2ddea; border-bottom: 1px solid #bacbdf; line-height:4em;}
#top h1 { font-size:1.7em; margin:0; padding:0; color:#000080; }
#content { padding:20px; }
-->
body { color:#000; background:#fff; margin:0; padding:0; font-family:sans-serif; }
h1 { font-size:28px; }
p,ul { font-size:13px; line-height:150%; }
#top { margin:0; padding:0 30px; color:#000; background:#f8f8f8; border-bottom: 1px solid #e7e7e7; line-height:50px; }
#top h1 { font-size:20px; margin:0; padding:0; color:#777e7d; font-weight:normal; }
#content { padding:20px 30px; }
</style> </style>
</head> </head>
<body> <body>


+ 2
- 2
cms/lang/english.page.lang.php View File

@ -45,8 +45,8 @@ $lang['comments_pagination_info'] = '[total_comments] comments, page [curre
$lang['comments_add_comment'] = 'Add comment'; $lang['comments_add_comment'] = 'Add comment';
$lang['comment_input_text'] = 'Add comment:'; $lang['comment_input_text'] = 'Add comment:';
$lang['comment_edit_text'] = 'Edit comment:'; $lang['comment_edit_text'] = 'Edit comment:';
$lang['comment_input_name'] = 'Name:';
$lang['comment_input_email_hp'] = 'E-mail or homepage:';
$lang['comment_input_name'] = 'Name';
$lang['comment_input_email_hp'] = 'E-mail or homepage';
$lang['comment_input_submit'] = '&nbsp;OK&nbsp;'; $lang['comment_input_submit'] = '&nbsp;OK&nbsp;';
$lang['comment_input_preview'] = 'Preview'; $lang['comment_input_preview'] = 'Preview';
$lang['comment_preview_hl'] = 'Preview:'; $lang['comment_preview_hl'] = 'Preview:';


+ 2
- 2
cms/templates/admin/main.tpl View File

@ -5,7 +5,7 @@
<title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration']; if(isset($subtitle)) echo ' - ' . $subtitle; ?></title> <title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration']; if(isset($subtitle)) echo ' - ' . $subtitle; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
<link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet"> <link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
<link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png"> <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
@ -45,7 +45,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<script src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script> <script src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script>
<?php if($mode=='galleries'): ?> <?php if($mode=='galleries'): ?>
<script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script> <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>


+ 5
- 5
cms/templates/default.tpl View File

@ -7,7 +7,7 @@
<meta name="description" content="<?php if($description) echo $description; else echo $settings['default_description']; ?>" /> <meta name="description" content="<?php if($description) echo $description; else echo $settings['default_description']; ?>" />
<meta name="keywords" content="<?php if($keywords) echo $keywords; else echo $settings['default_keywords']; ?>" /> <meta name="keywords" content="<?php if($keywords) echo $keywords; else echo $settings['default_keywords']; ?>" />
<meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>" /> <meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>" />
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
<link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet"> <link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
<?php if(isset($tv['map'])): ?> <?php if(isset($tv['map'])): ?>
@ -59,7 +59,7 @@
<div class="row<?php if(isset($tv['nocolumns'])): ?> main-content<?php endif; ?>"> <div class="row<?php if(isset($tv['nocolumns'])): ?> main-content<?php endif; ?>">
<?php if(empty($tv['nocolumns'])): ?> <?php if(empty($tv['nocolumns'])): ?>
<div class="col-md-8 main-content">
<div class="col-md-9 main-content">
<?php endif; ?> <?php endif; ?>
<?php if(empty($hide_content)) echo $content; ?> <?php if(empty($hide_content)) echo $content; ?>
@ -68,7 +68,7 @@
</div> </div>
<?php if($sidebar_2): ?> <?php if($sidebar_2): ?>
<div class="col-md-4 sidebar">
<div class="col-md-3 sidebar">
<hr class="visible-xs"> <hr class="visible-xs">
<?php echo $sidebar_2; ?> <?php echo $sidebar_2; ?>
</div> </div>
@ -100,12 +100,12 @@
</div> </div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<script src="<?php echo STATIC_URL; ?>js/main.js"></script> <script src="<?php echo STATIC_URL; ?>js/main.js"></script>
<?php if($admin): ?> <?php if($admin): ?>
<script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script> <script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
<?php endif; ?> <?php endif; ?>
<?php if(isset($contains_thumbnails) && $settings['lightbox_enabled']): ?>
<?php if(isset($contains_thumbnails)): ?>
<script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script> <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>
<?php endif; ?> <?php endif; ?>
<?php if(isset($tv['map'])): ?> <?php if(isset($tv['map'])): ?>


+ 10
- 10
cms/templates/subtemplates/notes.inc.tpl View File

@ -1,22 +1,22 @@
<?php if(isset($notes)): ?> <?php if(isset($notes)): ?>
<?php foreach($notes as $note): ?>
<div class="news">
<p class="time"><?php echo $lang['note_time'][$note['id']]; ?></p>
<h2><?php if($note['link']): ?><a href="<?php echo $note['link']; ?>"><?php echo $note['title']; ?></a><?php else: ?><?php echo $note['title']; ?><?php endif; ?></h2>
<?php if($note['text']) echo $note['text']; ?>
<?php if($note['link']): ?><p class="link"><a href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a></p><?php endif; ?>
</div>
<?php endforeach; ?>
<?php foreach($notes as $note): ?>
<div class="news">
<p class="time"><?php echo $lang['note_time'][$note['id']]; ?></p>
<h2><?php if($note['link']): ?><a href="<?php echo $note['link']; ?>"><?php echo $note['title']; ?></a><?php else: ?><?php echo $note['title']; ?><?php endif; ?></h2>
<?php if($note['text']): ?><p><?php echo $note['text']; ?></p><?php endif; ?>
<?php if($note['linkname']): ?><p class="link"><a class="btn btn-primary" href="<?php echo $note['link']; ?>"><?php echo $note['linkname']; ?></a></p><?php endif; ?>
</div>
<?php endforeach; ?>
<?php if($pagination): ?>
<?php if($pagination): ?>
<p class="pagination"><?php echo $lang['pagination']; ?> [ <p class="pagination"><?php echo $lang['pagination']; ?> [
<?php if($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?> <?php if($pagination['previous']): ?> <a href="<?php echo BASE_URL . PAGE; if($pagination['previous']>1): ?>,<?php echo $pagination['previous']; endif; ?>">&laquo;</a> <?php endif; ?>
<?php foreach($pagination['items'] as $item): ?> <?php foreach($pagination['items'] as $item): ?>
<?php if(empty($item)): ?> ..<?php elseif($item==$pagination['current']): ?> <span class="current"><?php echo $item; ?></span><?php else: ?> <a href="<?php echo BASE_URL . PAGE; if($item>1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?> <?php if(empty($item)): ?> ..<?php elseif($item==$pagination['current']): ?> <span class="current"><?php echo $item; ?></span><?php else: ?> <a href="<?php echo BASE_URL . PAGE; if($item>1): ?>,<?php echo $item; endif; ?>"><?php echo $item; ?></a><?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if($pagination['next']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?> <?php if($pagination['next']): ?> <a href="<?php echo BASE_URL . PAGE; ?>,<?php echo $pagination['next']; ?>">&raquo;</a><?php endif; ?>
]</p>
]</p>
<?php endif; ?> <?php endif; ?>
<?php else: ?> <?php else: ?>


+ 9
- 9
index.php View File

@ -72,7 +72,7 @@ try
// load replacement functions for the multibyte string functions // load replacement functions for the multibyte string functions
// if they are not available: // if they are not available:
if(!defined('MB_CASE_LOWER')) require('./cms/includes/functions.mb_replacements.inc.php');
#if(!defined('MB_CASE_LOWER')) require('./cms/includes/functions.mb_replacements.inc.php');
require('./cms/includes/classes/Database.class.php'); require('./cms/includes/classes/Database.class.php');
$database = new Database(); $database = new Database();
@ -151,16 +151,16 @@ try
} }
} }
if(isset($_GET['get_1']) && $_GET['get_1']==IMAGE_IDENTIFIER && isset($_GET['get_2']))
{
// photo:
include(BASE_PATH.'cms/includes/photo.inc.php');
}
else
{
#if(isset($_GET['get_1']) && $_GET['get_1']==IMAGE_IDENTIFIER && isset($_GET['get_2']))
# {
# // photo:
# include(BASE_PATH.'cms/includes/photo.inc.php');
# }
#else
# {
// regular content: // regular content:
include(BASE_PATH.'cms/includes/content.inc.php'); include(BASE_PATH.'cms/includes/content.inc.php');
}
# }
if(isset($_SESSION[$settings['session_prefix'].'user_id'])) $localization->add_language_file(BASE_PATH.'cms/lang/'.$settings['admin_language'].'.admin.lang.php'); if(isset($_SESSION[$settings['session_prefix'].'user_id'])) $localization->add_language_file(BASE_PATH.'cms/lang/'.$settings['admin_language'].'.admin.lang.php');


+ 6
- 4
static/css/style.css View File

@ -18,9 +18,12 @@ header ul { padding:20px 0 0 0; }
.topsep { margin:10px 0 15px 0; } .topsep { margin:10px 0 15px 0; }
.main-content p, .main-content p,
.main-content ul,
.main-content ul { line-height:175%; }
.sidebar { margin-top:30px; }
.sidebar p, .sidebar p,
.sidebar ul { line-height:175%; } .sidebar ul { line-height:175%; }
.teaser p { margin-top:0; }
.teaser .thumbnail { margin-bottom:5px; }
.caption { margin:3px 0 3px 0; color:#808080; font-style:italic; } .caption { margin:3px 0 3px 0; color:#808080; font-style:italic; }
.thumbnail { max-width:100% !important; height:auto; } .thumbnail { max-width:100% !important; height:auto; }
@ -46,7 +49,7 @@ a.thumbnail:hover { opacity:0.9; }
.overview h2 a { color:#333; text-decoration:none; } .overview h2 a { color:#333; text-decoration:none; }
.news { margin-bottom:30px; }
.news { margin:30px 0 30px 0; }
.news:first-child { margin-top:20px; } .news:first-child { margin-top:20px; }
.news h2 { margin:0; padding:0; } .news h2 { margin:0; padding:0; }
.news h2 a { color:#333; text-decoration:none; } .news h2 a { color:#333; text-decoration:none; }
@ -100,9 +103,8 @@ a.pdf { padding-left:23px; background-image:url(../img/p
@media (min-width: 992px) @media (min-width: 992px)
{ {
.sidebar { padding-left:30px; }
.header .nav { margin-top:37px; float:right; text-align:right; } .header .nav { margin-top:37px; float:right; text-align:right; }
.sidebar { padding-left:50px; }
.sidebar { margin-top:0; }
} }
@media screen and (max-width:768px) @media screen and (max-width:768px)


Write Preview
Loading…
Cancel
Save