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

update to Bootstrap 3.1, modifications for Bootstrap 3.1

pull/10/head
Mark (ilosuna) 11 years ago
parent
9df9410f88
commit
295ee76fa9
19 changed files with 134 additions and 96 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +17
    -18
      cms/config/db_settings.conf.php
  2. BIN
      cms/data/content.sqlite
  3. BIN
      cms/data/entries.sqlite
  4. BIN
      cms/data/userdata.sqlite
  5. +0
    -2
      cms/includes/functions.inc.php
  6. +2
    -2
      cms/templates/admin/main.tpl
  7. +28
    -9
      cms/templates/admin/subtemplates/edit.inc.tpl
  8. +1
    -1
      cms/templates/admin/subtemplates/galleries_edit.inc.tpl
  9. +8
    -4
      cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl
  10. +6
    -6
      cms/templates/admin/subtemplates/modal_insert_gallery.tpl
  11. +8
    -7
      cms/templates/admin/subtemplates/modal_insert_image.tpl
  12. +6
    -6
      cms/templates/admin/subtemplates/modal_insert_raw_image.tpl
  13. +8
    -7
      cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
  14. +3
    -6
      cms/templates/default.tpl
  15. +3
    -3
      static/css/style.css
  16. +14
    -17
      static/css/style_admin.css
  17. +4
    -5
      static/js/admin_backend.js
  18. +1
    -2
      static/js/main.js
  19. +25
    -1
      static/js/mylightbox.js

+ 17
- 18
cms/config/db_settings.conf.php View File

@ -19,26 +19,25 @@ $db_settings['db_userdata_file'] = 'cms/data/userdata.sqlite';
$db_settings['userdata_table'] = 'phpsqlitecms_userdata'; $db_settings['userdata_table'] = 'phpsqlitecms_userdata';
/* /*
// PostgreSQL: // PostgreSQL:
$db_settings['type'] = 'postgresql';
$db_settings['type'] = 'postgresql';
$db_settings['host'] = 'localhost';
$db_settings['port'] = 5432;
$db_settings['user'] = 'user';
$db_settings['password'] = 'password';
$db_settings['database'] = 'phpsqlitecms';
$db_settings['host'] = 'localhost';
$db_settings['port'] = 5432;
$db_settings['user'] = 'user';
$db_settings['password'] = 'password';
$db_settings['database'] = 'phpsqlitecms';
$db_settings['settings_table'] = 'phpsqlitecms_settings';
$db_settings['pages_table'] = 'phpsqlitecms_pages';
$db_settings['menu_table'] = 'phpsqlitecms_menus';
$db_settings['gcb_table'] = 'phpsqlitecms_gcb';
$db_settings['news_table'] = 'phpsqlitecms_news';
$db_settings['news_table'] = 'phpsqlitecms_news';
$db_settings['notes_table'] = 'phpsqlitecms_notes';
$db_settings['photo_table'] = 'phpsqlitecms_photos';
$db_settings['banlists_table'] = 'phpsqlitecms_banlists';
$db_settings['comment_table'] = 'phpsqlitecms_comments';
$db_settings['userdata_table'] = 'phpsqlitecms_userdata';
$db_settings['settings_table'] = 'phpsqlitecms_settings';
$db_settings['pages_table'] = 'phpsqlitecms_pages';
$db_settings['menu_table'] = 'phpsqlitecms_menus';
$db_settings['gcb_table'] = 'phpsqlitecms_gcb';
$db_settings['news_table'] = 'phpsqlitecms_news';
$db_settings['news_table'] = 'phpsqlitecms_news';
$db_settings['notes_table'] = 'phpsqlitecms_notes';
$db_settings['photo_table'] = 'phpsqlitecms_photos';
$db_settings['banlists_table'] = 'phpsqlitecms_banlists';
$db_settings['comment_table'] = 'phpsqlitecms_comments';
$db_settings['userdata_table'] = 'phpsqlitecms_userdata';
*/ */
?> ?>

BIN
cms/data/content.sqlite View File


BIN
cms/data/entries.sqlite View File


BIN
cms/data/userdata.sqlite View File


+ 0
- 2
cms/includes/functions.inc.php View File

@ -5,7 +5,6 @@ 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)
@ -18,7 +17,6 @@ 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)
{ {


+ 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.2/css/bootstrap.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/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.2/js/bootstrap.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/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>


+ 28
- 9
cms/templates/admin/subtemplates/edit.inc.tpl View File

@ -81,9 +81,9 @@
<div class="form-group"> <div class="form-group">
<div class="col-lg-12"> <div class="col-lg-12">
<a class="btn btn-default btn-xs modal-invoker" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-input="content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></a>
<a class="btn btn-default btn-xs modal-invoker" href="index.php?mode=modal&amp;action=insert_thumbnail" data-toggle="modal" data-target="#modal_thumbnail" data-input="content" title="<?php echo $lang['insert_thumbnail_label']; ?>"><span class="glyphicon glyphicon-hand-left"></a>
<a class="btn btn-default btn-xs modal-invoker" href="index.php?mode=modal&amp;action=insert_gallery" data-toggle="modal" data-target="#modal_gallery" data-input="content" title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></a>
<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-insert="#content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></a>
<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail" data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content" title="<?php echo $lang['insert_thumbnail_label']; ?>"><span class="glyphicon glyphicon-hand-left"></a>
<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery" data-toggle="modal" data-target="#modal_gallery" data-insert="#content" title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></a>
</div> </div>
</div> </div>
@ -407,7 +407,7 @@
<div class="input-group"> <div class="input-group">
<input type="text" id="teaser_img" name="teaser_img" value="<?php if(isset($page_data['teaser_img'])) echo $page_data['teaser_img']; ?>" size="35" class="form-control"> <input type="text" id="teaser_img" name="teaser_img" value="<?php if(isset($page_data['teaser_img'])) echo $page_data['teaser_img']; ?>" size="35" class="form-control">
<span class="input-group-btn"> <span class="input-group-btn">
<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image" type="button" title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image" data-input="teaser_img"><span class="glyphicon glyphicon-search"></span></a>
<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image" type="button" title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image" data-insert="#teaser_img"><span class="glyphicon glyphicon-search"></span></a>
</span> </span>
</div> </div>
@ -449,8 +449,27 @@
</form> </form>
<?php endif; ?> <?php endif; ?>
<div class="modal fade" id="modal_image" tabindex="-1"></div>
<div class="modal fade" id="modal_thumbnail" tabindex="-1"></div>
<div class="modal fade" id="modal_gallery" tabindex="-1"></div>
<div class="modal fade" id="modal_raw_image" tabindex="-1"></div>
<div class="modal fade" id="modal_image" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>
<div class="modal fade" id="modal_thumbnail" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>
<div class="modal fade" id="modal_gallery" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>
<div class="modal fade" id="modal_raw_image" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>

+ 1
- 1
cms/templates/admin/subtemplates/galleries_edit.inc.tpl View File

@ -27,7 +27,7 @@
<tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=galleries&amp;reorder_photos=true"> <tbody data-sortable="<?php echo BASE_URL; ?>cms/?mode=galleries&amp;reorder_photos=true">
<?php $i=0; foreach($items as $item): ?> <?php $i=0; foreach($items as $item): ?>
<tr id="item_<?php echo $item['id']; ?>"> <tr id="item_<?php echo $item['id']; ?>">
<td><a class="thumbnail" href="<?php echo BASE_URL.MEDIA_DIR.$item['photo_normal']; ?>" data-lightbox><img id="photo<?php echo $item['id']; ?>" src="<?php echo BASE_URL.MEDIA_DIR.$item['photo_thumbnail']; ?>" alt="<?php echo $item['title']; ?>" /></a></td>
<td><a class="thumbnail" href="<?php echo BASE_URL.MEDIA_DIR.$item['photo_normal']; ?>" data-lightbox><img id="photo<?php echo $item['id']; ?>" src="<?php echo BASE_URL.MEDIA_DIR.$item['photo_thumbnail']; ?>" title="<?php echo htmlspecialchars($item['title']); ?>" alt="<?php echo htmlspecialchars($item['title']); ?>" data-subtitle="<?php echo htmlspecialchars($item['subtitle']); ?>" data-description="<?php echo htmlspecialchars($item['description']); ?>" /></a></td>
<td><?php echo $item['title']; ?></td> <td><?php echo $item['title']; ?></td>
<td><?php echo $item['subtitle']; ?></td> <td><?php echo $item['subtitle']; ?></td>
<td><?php echo $item['description']; ?></td> <td><?php echo $item['description']; ?></td>


+ 8
- 4
cms/templates/admin/subtemplates/galleries_edit_photo.inc.tpl View File

@ -30,7 +30,7 @@
<div class="input-group"> <div class="input-group">
<input id="photo_thumbnail" class="form-control form-control" type="text" name="photo_thumbnail" value="<?php if(isset($photo_data['photo_thumbnail'])) echo $photo_data['photo_thumbnail']; ?>"> <input id="photo_thumbnail" class="form-control form-control" type="text" name="photo_thumbnail" value="<?php if(isset($photo_data['photo_thumbnail'])) echo $photo_data['photo_thumbnail']; ?>">
<span class="input-group-btn"> <span class="input-group-btn">
<a class="btn btn-default modal-invoker" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-input="photo_thumbnail" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
<a class="btn btn-default" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-insert="#photo_thumbnail" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
</span> </span>
</div> </div>
@ -43,7 +43,7 @@
<div class="input-group"> <div class="input-group">
<input id="photo_normal" class="form-control" type="text" name="photo_normal" value="<?php if(isset($photo_data['photo_normal'])) echo $photo_data['photo_normal']; ?>"> <input id="photo_normal" class="form-control" type="text" name="photo_normal" value="<?php if(isset($photo_data['photo_normal'])) echo $photo_data['photo_normal']; ?>">
<span class="input-group-btn"> <span class="input-group-btn">
<a class="btn btn-default modal-invoker" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-input="photo_normal" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
<a class="btn btn-default modal-invoker" href="index.php?mode=modal&action=insert_raw_image" data-toggle="modal" data-target="#modal_raw_image" data-insert="#photo_normal" data-keyboard="true" title="<?php echo $lang['select_image']; ?>"><span class="glyphicon glyphicon-search"></a>
</span> </span>
</div> </div>
</div> </div>
@ -89,5 +89,9 @@
<?php endif; ?> <?php endif; ?>
<div class="modal fade" id="modal_raw_image" tabindex="-1"></div>
<div class="modal fade" id="modal_raw_image" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>

+ 6
- 6
cms/templates/admin/subtemplates/modal_insert_gallery.tpl View File

@ -1,5 +1,3 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"><?php echo $lang['insert_gallery_label']; ?></h4> <h4 class="modal-title"><?php echo $lang['insert_gallery_label']; ?></h4>
@ -21,13 +19,15 @@
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button> <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
<button id="insert-gallery" type="button" class="btn btn-primary"><?php echo $lang['insert_gallery_label']; ?></button> <button id="insert-gallery" type="button" class="btn btn-primary"><?php echo $lang['insert_gallery_label']; ?></button>
</div> </div>
</div>
</div>
<script> <script>
$(function() { $(function() {
$("#insert-gallery").click(function(e) { if(gallery = $("#galleryselect option:selected").val())
$("#galleryselect option").dblclick( function(e) {
$("#insert-gallery").click ();
});
$("#insert-gallery").click(function(e) {
if(gallery = $("#galleryselect option:selected").val())
{ {
$("#"+insertTarget).insertAtCaret("[gallery:"+gallery+"]");
$($insertField).insertAtCaret("[gallery:"+gallery+"]");
} }
$('#modal_gallery').modal('hide'); }); $('#modal_gallery').modal('hide'); });
}); });


+ 8
- 7
cms/templates/admin/subtemplates/modal_insert_image.tpl View File

@ -1,5 +1,3 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4> <h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
@ -31,16 +29,19 @@
<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button> <button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div>
</div>
<script> <script>
$(function() { $(function() {
$("#insert-image").click(function(e) { if(gallery = $("#imageselect option:selected").val())
$("#imageselect option").dblclick( function(e) {
$("#insert-image").click ();
});
$("#insert-image").click(function(e) {
if(gallery = $("#imageselect option:selected").val())
{ {
if(image_class = $("#image_class").val()) imageCode = "[image:"+gallery+"|"+image_class+"]"; if(image_class = $("#image_class").val()) imageCode = "[image:"+gallery+"|"+image_class+"]";
else imageCode = "[image:"+gallery+"]"; else imageCode = "[image:"+gallery+"]";
$("#"+insertTarget).insertAtCaret(imageCode);
$($insertField).insertAtCaret(imageCode);
} }
$('#modal_image').modal('hide'); });
$('#modal_image').modal('hide');
});
}); });
</script> </script>

+ 6
- 6
cms/templates/admin/subtemplates/modal_insert_raw_image.tpl View File

@ -1,5 +1,3 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4> <h4 class="modal-title"><?php echo $lang['insert_image']; ?></h4>
@ -11,7 +9,7 @@
<select id="imageselect" size="20" style="width:100%;"> <select id="imageselect" size="20" style="width:100%;">
<?php foreach($images as $image): ?> <?php foreach($images as $image): ?>
<option value="<?php echo $image; ?>" ondblclick="image_popup('<?php echo BASE_URL.MEDIA_DIR.$image; ?>')"><?php echo $image; ?></option>
<option value="<?php echo $image; ?>"><?php echo $image; ?></option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
@ -25,11 +23,13 @@
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button> <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo $lang['cancel']; ?></button>
<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button> <button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_image_button']; ?></button>
</div> </div>
</div>
</div>
<script> <script>
$(function() { $(function() {
$("#insert-image").click(function(e) { if(val = $("#imageselect option:selected").val()) $("#"+insertTarget).val(val);
$("#imageselect option").dblclick( function(e) {
$("#insert-image").click ();
});
$("#insert-image").click(function(e) {
if(val = $("#imageselect option:selected").val()) $($insertField).val(val);
$('#modal_raw_image').modal('hide'); $('#modal_raw_image').modal('hide');
}); });
}); });


+ 8
- 7
cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl View File

@ -1,5 +1,3 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"><?php echo $lang['insert_thumbnail']; ?></h4> <h4 class="modal-title"><?php echo $lang['insert_thumbnail']; ?></h4>
@ -30,16 +28,19 @@
<button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_thumbnail_button']; ?></button> <button id="insert-image" type="button" class="btn btn-primary"><?php echo $lang['insert_thumbnail_button']; ?></button>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div>
</div>
<script> <script>
$(function() { $(function() {
$("#insert-image").click(function(e) { if(thumbnail = $("#thumbnailselect option:selected").val())
$("#thumbnailselect option").dblclick( function(e) {
$("#insert-image").click ();
});
$("#insert-image").click(function(e) {
if(thumbnail = $("#thumbnailselect option:selected").val())
{ {
if(imageClass = $("#image_class").val()) imageCode = "[thumbnail:"+thumbnail+"|"+imageClass+"]"; if(imageClass = $("#image_class").val()) imageCode = "[thumbnail:"+thumbnail+"|"+imageClass+"]";
else imageCode = "[image:"+thumbnail+"]"; else imageCode = "[image:"+thumbnail+"]";
$("#"+insertTarget).insertAtCaret(imageCode);
$($insertField).insertAtCaret(imageCode);
} }
$('#modal_thumbnail').modal('hide'); });
$('#modal_thumbnail').modal('hide');
});
}); });
</script> </script>

+ 3
- 6
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.2/css/bootstrap.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/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'])): ?>
@ -46,7 +46,7 @@
<?php foreach($breadcrumbs as $breadcrumb): ?> <?php foreach($breadcrumbs as $breadcrumb): ?>
<li><a href="<?php echo BASE_URL.$breadcrumb['page']; ?>"><?php echo $breadcrumb['title']; ?></a></li> <li><a href="<?php echo BASE_URL.$breadcrumb['page']; ?>"><?php echo $breadcrumb['title']; ?></a></li>
<?php endforeach; ?> <?php endforeach; ?>
<li><?php if($title) echo $title; ?></li>
<li class="active"><?php echo $title; ?></li>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
@ -99,7 +99,7 @@
</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.2/js/bootstrap.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/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>
@ -107,8 +107,5 @@
<?php if(isset($contains_thumbnails)): ?> <?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'])): ?>
<script src="<?php echo STATIC_URL; ?>js/san_rafael_map.js"></script>
<?php endif; ?>
</body> </body>
</html> </html>

+ 3
- 3
static/css/style.css View File

@ -106,8 +106,8 @@ a.pdf { padding-left:23px; background-image:url(../img/p
#mylightbox-title { position:absolute; top:3px; left:10px; width:90%; margin:0; padding:0; font-weight:bold; } #mylightbox-title { position:absolute; top:3px; left:10px; width:90%; margin:0; padding:0; font-weight:bold; }
#mylightbox-controls { position:absolute; top:5px; right:10px; width:14px; margin:0; padding:0; } #mylightbox-controls { position:absolute; top:5px; right:10px; width:14px; margin:0; padding:0; }
#mylightbox #photo { margin:0; padding:0; } #mylightbox #photo { margin:0; padding:0; }
#mylightbox-subtitle { font-size:14px; line-height:150%; margin:0; padding:3px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:0; padding:5px 0 8px 0; }
#mylightbox-subtitle { font-size:13px; line-height:150%; margin:5px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:5px 0 10px 0; }
#mylightbox-author { color:#808080; font-size:13px; margin:-8px 0 0 0; padding:0 0 8px 0; } #mylightbox-author { color:#808080; font-size:13px; margin:-8px 0 0 0; padding:0 0 8px 0; }
#mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; } #mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; }
#mylightbox-photo { position:relative; } #mylightbox-photo { position:relative; }
@ -116,4 +116,4 @@ a.pdf { padding-left:23px; background-image:url(../img/p
#mylightbox-next { width:25%; position:absolute; top:0; right:0; bottom:0; background:url(../img/next.png) no-repeat 1000px 0; z-index:10000; text-indent:-999em; outline:none; } #mylightbox-next { width:25%; position:absolute; top:0; right:0; bottom:0; background:url(../img/next.png) no-repeat 1000px 0; z-index:10000; text-indent:-999em; outline:none; }
#mylightbox-next:hover { background:url(../img/next.png) no-repeat 90% center, linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.2)); } #mylightbox-next:hover { background:url(../img/next.png) no-repeat 90% center, linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.2)); }
#mylightbox-close { width:16px; height:16px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 0; outline:none; opacity:0.7; } #mylightbox-close { width:16px; height:16px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 0; outline:none; opacity:0.7; }
#mylightbox-close:hover { opacity:1; }
#mylightbox-close:hover { opacity:1; }

+ 14
- 17
static/css/style_admin.css View File

@ -23,7 +23,6 @@ body { padding-top:70px; padding-bottom:50px; }
textarea.html { font-family:monospace; } textarea.html { font-family:monospace; }
.nowrap { white-space:nowrap; } .nowrap { white-space:nowrap; }
.nomargin { margin:0; }
.table th a { color:#000; text-decoration:none; white-space:nowrap; } .table th a { color:#000; text-decoration:none; white-space:nowrap; }
.table th a .glyphicon { font-size:11px; padding-left:3px; } .table th a .glyphicon { font-size:11px; padding-left:3px; }
@ -39,22 +38,20 @@ td.options { text-align:right; white-space:nowrap; }
.sortable-handle { cursor:move; } .sortable-handle { cursor:move; }
#mylightbox-background { display:none; position:fixed; height:100%; width:100%; top:0; left:0; background:#000; border:1px solid #cecece; z-index:2000; } #mylightbox-background { display:none; position:fixed; height:100%; width:100%; top:0; left:0; background:#000; border:1px solid #cecece; z-index:2000; }
#mylightbox { width:400px; display:none; position:absolute; background:#fff; z-index:2000; padding:3px 10px 0 10px; font-size:13px; border:1px solid #cecece; border-radius:5px; max-width:90%; height:auto; box-shadow:7px 7px 10px #333; }
#mylightbox { width:400px; display:none; position:absolute; background:#fff; z-index:2000; padding:3px 10px 0 10px; font-size:13px; border:1px solid #cecece; border-radius:5px; max-width:90%; height:auto; box-shadow:5px 5px 20px #000; }
#mylightbox img { max-width:100%; height:auto; } #mylightbox img { max-width:100%; height:auto; }
#mylightbox-header { height:20px; font-size:13px; line-height:20px; padding:0 0 3px 0; }
#mylightbox-title { position:absolute; top:2px; left:10px; width:40%; margin:0; padding:0; font-weight:bold; }
#mylightbox-nav { position:absolute; top:2px; left:40%; width:20%; margin:0; padding:0; text-align:center; float:left; white-space:nowrap; }
#mylightbox-controls { position:absolute; top:4px; right:10px; width:14px; margin:0; padding:0; }
#mylightbox-header { height:25px; font-size:13px; line-height:20px; padding:0 0 10px 0; }
#mylightbox-title { position:absolute; top:3px; left:10px; width:90%; margin:0; padding:0; font-weight:bold; }
#mylightbox-controls { position:absolute; top:5px; right:10px; width:14px; margin:0; padding:0; }
#mylightbox #photo { margin:0; padding:0; } #mylightbox #photo { margin:0; padding:0; }
#mylightbox-subtitle { font-size:14px; line-height:150%; margin:0; padding:3px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:0; padding:3px 0 8px 0; }
#mylightbox-subtitle { font-size:13px; line-height:150%; margin:5px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:5px 0 10px 0; }
#mylightbox-author { color:#808080; font-size:13px; margin:-8px 0 0 0; padding:0 0 8px 0; }
#mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; } #mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; }
#mylightbox-prev { vertical-align:text-top; display:inline-block; width:16px; height:16px; margin:0; padding:0; background:url(../img/previous.png) no-repeat 0 0; }
#mylightbox-prev:hover { opacity:0.75; }
#mylightbox-next { vertical-align:text-top; display:inline-block; width:16px; height:16px; margin:0; padding:0; background:url(../img/next.png) no-repeat 0 0; }
#mylightbox-next:hover { opacity:0.75; }
#mylightbox-prev span,
#mylightbox-next span { display:none; }
#mylightbox-close { width:14px; height:14px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 0; outline:none; }
#mylightbox-close:hover { width:14px; height:14px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 -14px; outline:none; }
#mylightbox-photo { position:relative; }
#mylightbox-prev { width:25%; position:absolute; top:0; left:0; bottom:0; background:url(../img/prev.png) no-repeat -1000px 0; z-index:10000; text-indent:-999em; outline:none; }
#mylightbox-prev:hover { background:url(../img/prev.png) no-repeat 10% center, linear-gradient(to left, rgba(0,0,0,0), rgba(0,0,0,0.2)); }
#mylightbox-next { width:25%; position:absolute; top:0; right:0; bottom:0; background:url(../img/next.png) no-repeat 1000px 0; z-index:10000; text-indent:-999em; outline:none; }
#mylightbox-next:hover { background:url(../img/next.png) no-repeat 90% center, linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.2)); }
#mylightbox-close { width:16px; height:16px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 0; outline:none; opacity:0.7; }
#mylightbox-close:hover { opacity:1; }

+ 4
- 5
static/js/admin_backend.js View File

@ -16,9 +16,6 @@ obj.scrollTop = scrollTop;
$(function() { $(function() {
$("a[data-delete-confirm]").click(function(e) { e.preventDefault(); $("a[data-delete-confirm]").click(function(e) { e.preventDefault();
message = $(this).data('delete-confirm') ? decodeURIComponent($(this).data('delete-confirm')) : 'Delete?'; message = $(this).data('delete-confirm') ? decodeURIComponent($(this).data('delete-confirm')) : 'Delete?';
$(this).parents("tr").addClass('danger'); $(this).parents("tr").addClass('danger');
@ -31,7 +28,6 @@ $("a[data-delete-confirm]").click(function(e) { e.preventDefault();
$("*[data-toggle-checkboxes]").click(function(e) { e.preventDefault(); $("*[data-toggle-checkboxes]").click(function(e) { e.preventDefault();
var checkboxClass = $(this).data('toggle-checkboxes'); var checkboxClass = $(this).data('toggle-checkboxes');
//alert(checkboxClass);
$('.'+checkboxClass).trigger('click'); }); $('.'+checkboxClass).trigger('click'); });
@ -50,6 +46,9 @@ $("*[data-sortable]").sortable({ start : function(e, ui) { ui.item.addClass("war
$('.modal-invoker').click(function(e) { insertTarget = $(this).data('input'); });
$('.modal').on('show.bs.modal', function (e) {
$insertField = $(e.relatedTarget).data('insert');
});
}); });

+ 1
- 2
static/js/main.js View File

@ -1,6 +1,5 @@
$(function() { $(function() {
$('#carousel').carousel({ interval:8000 });
$("#menu-toggle-handle").click(function(e) { $('#nav').slideToggle('fast', function() { /*$('#edit_page_image_box .handle').toggleClass('handle_active', $(this).is(':visible'));*/ } ); });
$("#menu-toggle-handle").click(function(e) { $('#nav').slideToggle('fast'); });
}); });

+ 25
- 1
static/js/mylightbox.js View File

@ -15,6 +15,7 @@ myLightboxSettings['html_box'] = '<div id="mylightbox">\
<div id="mylightbox-controls"><a href="#" id="mylightbox-close" title="'+myLightboxSettings['close_link_title']+'" onclick="return false"><span>'+myLightboxSettings['close_link']+'</span></a></div>\ <div id="mylightbox-controls"><a href="#" id="mylightbox-close" title="'+myLightboxSettings['close_link_title']+'" onclick="return false"><span>'+myLightboxSettings['close_link']+'</span></a></div>\
</div>\ </div>\
<div id="mylightbox-photo"></div>\ <div id="mylightbox-photo"></div>\
<p id="mylightbox-subtitle"></p>\
<p id="mylightbox-description"></p>\ <p id="mylightbox-description"></p>\
<p id="mylightbox-author"></p>\ <p id="mylightbox-author"></p>\
</div>'; </div>';
@ -121,6 +122,7 @@ function doit(e,t)
var myLightboxLinks = new Array(); var myLightboxLinks = new Array();
var srcs = new Array(); var srcs = new Array();
var titles = new Array(); var titles = new Array();
var subtitles = new Array();
var descriptions = new Array(); var descriptions = new Array();
var authors = new Array(); var authors = new Array();
@ -131,6 +133,7 @@ function doit(e,t)
myLightboxLinks.push($(this)); myLightboxLinks.push($(this));
srcs.push($(this).attr('href')); srcs.push($(this).attr('href'));
titles.push($(this).find('img').attr('title')); titles.push($(this).find('img').attr('title'));
subtitles.push($(this).find('img').attr('data-subtitle'));
descriptions.push($(this).find('img').attr('data-description')); descriptions.push($(this).find('img').attr('data-description'));
authors.push($(this).find('img').attr('data-author')); authors.push($(this).find('img').attr('data-author'));
}); });
@ -138,6 +141,7 @@ function doit(e,t)
var numberOfImages = myLightboxLinks.length; var numberOfImages = myLightboxLinks.length;
var src = srcs[mylightboxCurrent]; var src = srcs[mylightboxCurrent];
var title = titles[mylightboxCurrent]; var title = titles[mylightboxCurrent];
var subtitle = subtitles[mylightboxCurrent];
var description = descriptions[mylightboxCurrent]; var description = descriptions[mylightboxCurrent];
var author = authors[mylightboxCurrent]; var author = authors[mylightboxCurrent];
@ -210,8 +214,28 @@ function doit(e,t)
//$("#mylightbox-next").remove(); //$("#mylightbox-next").remove();
} }
if(subtitle)
{
$("#mylightbox-subtitle").html(subtitle);
$("#mylightbox-subtitle").show();
}
else
{
$("#mylightbox-subtitle").hide();
}
$("#mylightbox-description").html(description); $("#mylightbox-description").html(description);
$("#mylightbox-author").html(author);
if(author)
{
$("#mylightbox-author").html(author);
$("#mylightbox-author").show();
}
else
{
$("#mylightbox-author").hide();
}
$("#mylightbox-photo").fadeIn("fast"); $("#mylightbox-photo").fadeIn("fast");
myLightboxCurrentWidth = objImagePreloader.width; myLightboxCurrentWidth = objImagePreloader.width;


Write Preview
Loading…
Cancel
Save