首頁 探索 說明
登入
Paenibacillus
/
sorbetcms
複製自 richard/sorbetcms
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 提交歷史 290 版本發佈 0 Wiki
瀏覽代碼

Replaced old and deleted PHP functions and slightly modified themes.

Klectik 8 年之前
父節點
b43ca639a3
當前提交
3072457fb3
共有 7 個文件被更改，包括 13 次插入 和 13 次删除
統一視圖 顯示文件統計
  1. 1 1
      archive.php
  2. 1 1
      classes/gettext.class.php
  3. 1 1
      classes/pagination.class.php
  4. 1 1
      index.php
  5. 1 1
      themes/SorbetDark/css/bootstrap.min.css
  6. 4 4
      themes/SorbetDark/index.htm
  7. 4 4
      themes/SorbetLight/index.htm

+ 1 - 1
archive.php 查看文件

128 
 		<meta name="generator" content="sorbet <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
128 
 		<meta name="generator" content="sorbet <?php echo $util_class->codeName()." (".$util_class->version().")"; ?>" />
129 
 		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
129 
 		<link rel="shortcut icon" href="<?php echo $conf->urlSorbet;?>/images/favicon.ico" />
130 
 		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlSorbet.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
130 
 		<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $conf->urlSorbet.($conf->urlFriendly ? "/rss/" : "/rss.php"); ?>"/>
131 
-		<title><?php echo $conf->title." &raquo; ".__(" archive"); ?></title>
131 
+		<title><?php echo $conf->title." - ".__(" archive"); ?></title>
132 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.js"></script>
132 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.js"></script>
133 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.scrollTo-min.js"></script>
133 
 		<script language="javascript" type="text/javascript" src="<?php echo $conf->urlSorbet;?>/admin/scripts/jquery.scrollTo-min.js"></script>
134 
 		<link href="<?php echo $conf->urlSorbet;?>/admin/css/archive.css" type="text/css" rel="stylesheet">
134 
 		<link href="<?php echo $conf->urlSorbet;?>/admin/css/archive.css" type="text/css" rel="stylesheet">

+ 1 - 1
classes/gettext.class.php 查看文件

303 
         } else {
 303 
         } else {
304 
             $header = $this->get_translation_string(0);
 304 
             $header = $this->get_translation_string(0);
305 
         }
 305 
         }
306 
-        if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) {
306 
+        if (preg_match("/plural-forms: ([^\n]*)\n/i", $header, $regs)) {
307 
             $expr = $regs[1];
 307 
             $expr = $regs[1];
308 
         } else {
 308 
         } else {
309 
             $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
 309 
             $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";

+ 1 - 1
classes/pagination.class.php 查看文件

101 
         #to change urlFriendly
 101 
         #to change urlFriendly
102 
         public function urlFriendly($value="%")
 102 
         public function urlFriendly($value="%")
103 
         {
 103 
         {
104 
-            if (eregi('^ *$', $value)) {
104 
+            if (preg_match('/^ *$/i', $value)) {
105 
                 $this->urlF=false;
 105 
                 $this->urlF=false;
106 
                 return false;
 106 
                 return false;
107 
             }
 107 
             }

+ 1 - 1
index.php 查看文件

59 
         $sorbet_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlSorbet."/images/favicon.ico\" />";
 59 
         $sorbet_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlSorbet."/images/favicon.ico\" />";
60
60
61 
         $page_title = $conf->title;
 61 
         $page_title = $conf->title;
62 
-        $page_title_divisor = " &raquo; "; // it should be set in configuration
62 
+        $page_title_divisor = " - "; // it should be set in configuration
63 
         $page_title_len = 50; // it should be set in configuration
 63 
         $page_title_len = 50; // it should be set in configuration
64 
         if ($id_post) {
 64 
         if ($id_post) {
65 
             $register = $tumble->getPost($id_post);
 65 
             $register = $tumble->getPost($id_post);

文件差異過大導致無法顯示
+ 1 - 1
themes/SorbetDark/css/bootstrap.min.css


+ 4 - 4
themes/SorbetDark/index.htm 查看文件

12 
   </head>
 12 
   </head>
13 
   <body>
 13 
   <body>
14 
     <div class="container">
 14 
     <div class="container">
15 
-      <header>
16 
-        <h1><a href="{URL_Tumble}">{Title}</a></h1>
17 
-        <p class="lead">{Description}</p>
18 
-      </header>
19 
       {if $isAuthenticated}
 15 
       {if $isAuthenticated}
20 
       <nav class="navbar navbar-default">
 16 
       <nav class="navbar navbar-default">
21 
         <div class="container-fluid">
 17 
         <div class="container-fluid">
38 
         </div>
 34 
         </div>
39 
       </nav>
 35 
       </nav>
40 
       {/if}
 36 
       {/if}
37 
+      <header>
38 
+        <h1><a href="{URL_Tumble}">{Title}</a></h1>
39 
+        <p class="lead">{Description}</p>
40 
+      </header>
41 
       {if $error}
 41 
       {if $error}
42 
         <div>{$error}</div>
 42 
         <div>{$error}</div>
43 
       {else}
 43 
       {else}

+ 4 - 4
themes/SorbetLight/index.htm 查看文件

12 
   </head>
 12 
   </head>
13 
   <body>
 13 
   <body>
14 
     <div class="container">
 14 
     <div class="container">
15 
-      <header>
16 
-        <h1><a href="{URL_Tumble}">{Title}</a></h1>
17 
-        <p class="lead">{Description}</p>
18 
-      </header>
19 
       {if $isAuthenticated}
 15 
       {if $isAuthenticated}
20 
       <nav class="navbar navbar-default">
 16 
       <nav class="navbar navbar-default">
21 
         <div class="container-fluid">
 17 
         <div class="container-fluid">
38 
         </div>
 34 
         </div>
39 
       </nav>
 35 
       </nav>
40 
       {/if}
 36 
       {/if}
37 
+      <header>
38 
+        <h1><a href="{URL_Tumble}">{Title}</a></h1>
39 
+        <p class="lead">{Description}</p>
40 
+      </header>
41 
       {if $error}
 41 
       {if $error}
42 
         <div>{$error}</div>
 42 
         <div>{$error}</div>
43 
       {else}
 43 
       {else}