wait #5341 @1

diff --git a/css/fonts/icons/Glyphter.eot b/css/fonts/icons/Glyphter.eot
new file mode 100644 (file)
index 0000000..64c114a
Binary files /dev/null and b/css/fonts/icons/Glyphter.eot differ

diff --git a/css/fonts/icons/Glyphter.svg b/css/fonts/icons/Glyphter.svg
new file mode 100644 (file)
index 0000000..304d6d5
--- /dev/null
+++ b/css/fonts/icons/Glyphter.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" ><svg xmlns="http://www.w3.org/2000/svg"><metadata>Generated by Glyphter</metadata><defs><font id="Glyphter" horiz-adv-x="0"><font-face units-per-em="1024" ascent="1024" descent="0" font-family="Glyphter" font-weight="normal" /><missing-glyph horiz-adv-x="0" /><glyph unicode="&#x0041;" d="M838.809,524.394C838.809,524.394,773.447,524.394,773.447,524.394C766.911,524.394,762.553,528.751,762.553,535.287C762.553,535.287,762.553,666.011,762.553,666.011C762.553,672.547,766.911,676.904,773.447,676.904C773.447,676.904,838.809,676.904,838.809,676.904C882.383,676.904,915.064,644.223,915.064,600.649C915.064,557.074,882.383,524.394,838.809,524.394C838.809,524.394,838.809,524.394,838.809,524.394M784.34,546.181C784.34,546.181,838.809,546.181,838.809,546.181C869.311,546.181,893.277,570.147,893.277,600.649C893.277,631.151,869.311,655.117,838.809,655.117C838.809,655.117,784.34,655.117,784.34,655.117C784.34,655.117,784.34,546.181,784.34,546.181C784.34,546.181,784.34,546.181,784.34,546.181M468.426,633.33C464.068,633.33,461.889,635.509,459.711,639.866C453.174,650.76,440.102,657.296,427.03,657.296C427.03,657.296,424.851,657.296,424.851,657.296C411.779,659.474,398.706,652.938,392.17,639.866C389.991,635.509,383.455,633.33,376.919,635.509C372.562,637.687,370.383,644.223,372.562,650.76C383.455,670.368,405.243,681.262,424.851,679.083C446.638,681.262,466.247,670.368,477.14,650.76C479.319,646.402,479.319,639.866,472.783,635.509C472.783,633.33,470.604,633.33,468.426,633.33C468.426,633.33,468.426,633.33,468.426,633.33M642.723,633.33C638.366,633.33,636.187,635.509,634.009,639.866C627.472,650.76,614.4,657.296,601.328,657.296C601.328,657.296,599.149,657.296,599.149,657.296C586.077,659.474,573.004,652.938,566.468,639.866C564.289,635.509,557.753,633.33,551.217,635.509C546.86,637.687,544.681,644.223,546.86,650.76C557.753,670.368,579.54,681.262,599.149,679.083C620.936,681.262,640.545,670.368,651.438,650.76C653.617,646.402,653.617,639.866,647.081,635.509C647.081,633.33,644.902,633.33,642.723,633.33C642.723,633.33,642.723,633.33,642.723,633.33M10.894,1.5C4.357,1.5,0,5.857,0,12.394C0,12.394,0,55.968,0,55.968C0,132.223,47.932,201.943,119.83,230.266C119.83,230.266,333.345,299.985,333.345,299.985C350.774,306.521,368.204,302.164,383.455,291.27C383.455,291.27,518.536,195.406,518.536,195.406C522.894,193.228,522.894,188.87,522.894,184.513C522.894,180.155,518.536,177.977,516.357,175.798C516.357,175.798,348.596,121.33,348.596,121.33C344.238,116.972,339.881,116.972,337.702,116.972C320.272,116.972,305.021,132.223,305.021,149.653C305.021,149.653,305.021,267.304,305.021,267.304C305.021,267.304,128.545,208.479,128.545,208.479C65.362,184.513,21.787,123.509,21.787,55.968C21.787,55.968,21.787,12.394,21.787,12.394C21.787,5.857,17.43,1.5,10.894,1.5C10.894,1.5,10.894,1.5,10.894,1.5M326.809,273.84C326.809,273.84,326.809,149.653,326.809,149.653C326.809,143.117,333.345,138.76,337.702,138.76C337.702,138.76,339.881,140.938,339.881,140.938C339.881,140.938,488.034,191.049,488.034,191.049C488.034,191.049,370.383,273.84,370.383,273.84C361.668,280.377,350.774,282.555,339.881,278.198C339.881,278.198,326.809,273.84,326.809,273.84C326.809,273.84,326.809,273.84,326.809,273.84M1013.106,1.5C1006.57,1.5,1002.213,5.857,1002.213,12.394C1002.213,12.394,1002.213,55.968,1002.213,55.968C1002.213,123.509,958.638,184.513,895.455,208.479C895.455,208.479,718.979,269.483,718.979,269.483C718.979,269.483,718.979,149.653,718.979,149.653C718.979,132.223,703.728,116.972,686.298,116.972C684.119,116.972,679.762,116.972,675.404,121.33C675.404,121.33,509.821,177.977,509.821,177.977C505.464,180.155,503.285,182.334,503.285,186.691C503.285,191.049,505.464,195.406,507.643,197.585C507.643,197.585,647.081,295.628,647.081,295.628C660.153,306.521,679.762,308.7,695.013,304.343C695.013,304.343,904.17,230.266,904.17,230.266C976.068,201.943,1024,132.223,1024,55.968C1024,55.968,1024,12.394,1024,12.394C1024,5.857,1019.643,1.5,1013.106,1.5C1013.106,1.5,1013.106,1.5,1013.106,1.5M535.966,191.049C535.966,191.049,684.119,140.938,684.119,140.938C684.119,140.938,686.298,140.938,686.298,138.76C692.834,138.76,697.191,143.117,697.191,149.653C697.191,149.653,697.191,278.198,697.191,278.198C697.191,278.198,686.298,280.377,686.298,280.377C675.404,282.555,664.511,282.555,657.974,276.019C657.974,276.019,535.966,191.049,535.966,191.049C535.966,191.049,535.966,191.049,535.966,191.049M512,1.5C505.464,1.5,501.106,5.857,501.106,12.394C501.106,12.394,501.106,186.691,501.106,186.691C501.106,193.228,505.464,197.585,512,197.585C518.536,197.585,522.894,193.228,522.894,186.691C522.894,186.691,522.894,12.394,522.894,12.394C522.894,5.857,518.536,1.5,512,1.5C512,1.5,512,1.5,512,1.5M599.149,437.245C599.149,437.245,533.787,437.245,533.787,437.245C527.251,437.245,522.894,441.602,522.894,448.138C522.894,454.674,527.251,459.032,533.787,459.032C533.787,459.032,599.149,459.032,599.149,459.032C664.511,459.032,725.515,489.534,764.732,541.823C769.089,546.181,775.626,548.36,779.983,544.002C784.34,539.645,786.519,533.109,782.162,528.751C738.587,472.104,671.047,437.245,599.149,437.245C599.149,437.245,599.149,437.245,599.149,437.245M695.013,689.977C690.655,689.977,686.298,694.334,684.119,698.691C684.119,698.691,671.047,764.053,671.047,764.053C559.932,766.232,518.536,803.27,503.285,831.594C488.034,803.27,446.638,766.232,335.523,764.053C335.523,764.053,322.451,698.691,322.451,698.691C320.272,692.155,315.915,689.977,309.379,689.977C302.843,692.155,300.664,696.513,300.664,703.049C300.664,703.049,315.915,777.126,315.915,777.126C315.915,781.483,322.451,785.84,326.809,785.84C485.855,785.84,490.213,859.917,490.213,862.096C490.213,868.632,494.57,872.989,501.106,872.989C501.106,872.989,505.464,872.989,505.464,872.989C512,872.989,516.357,868.632,516.357,862.096C516.357,859.917,520.715,785.84,679.762,785.84C684.119,785.84,688.477,781.483,690.655,777.126C690.655,777.126,705.906,703.049,705.906,703.049C708.085,696.513,703.728,692.155,697.191,689.977C697.191,689.977,695.013,689.977,695.013,689.977C695.013,689.977,695.013,689.977,695.013,689.977M514.179,306.521C446.638,306.521,305.021,382.777,285.413,504.785C283.234,515.679,276.698,524.394,267.983,528.751C235.302,544.002,220.051,583.219,217.872,613.721C217.872,637.687,224.409,657.296,239.66,670.368C220.051,790.198,237.481,881.704,287.591,940.53C335.523,994.998,409.6,1023.321,512,1023.321C614.4,1023.321,690.655,994.998,736.409,940.53C788.698,879.526,803.949,785.84,784.34,661.653C784.34,655.117,777.804,650.76,771.268,652.938C764.732,652.938,760.374,659.474,762.553,666.011C782.162,781.483,766.911,870.811,718.979,925.279C675.404,975.389,605.685,1001.534,512,1001.534C416.136,1001.534,346.417,975.389,305.021,925.279C257.089,868.632,241.838,781.483,261.447,666.011C261.447,661.653,259.268,657.296,254.911,655.117C244.017,648.581,237.481,633.33,239.66,615.9C239.66,591.934,252.732,561.432,276.698,548.36C294.128,539.645,305.021,526.572,307.2,506.964C324.63,400.206,453.174,326.13,514.179,326.13C553.396,330.487,590.434,345.738,623.115,369.704C627.472,374.062,634.009,371.883,638.366,367.526C642.723,363.168,640.545,356.632,636.187,352.274C599.149,328.309,559.932,310.879,514.179,306.521C516.357,306.521,514.179,306.521,514.179,306.521C514.179,306.521,514.179,306.521,514.179,306.521" class="icon-chef"/></font></defs></svg>
\ No newline at end of file

diff --git a/css/fonts/icons/Glyphter.ttf b/css/fonts/icons/Glyphter.ttf
new file mode 100644 (file)
index 0000000..e27ec1c
Binary files /dev/null and b/css/fonts/icons/Glyphter.ttf differ

diff --git a/css/fonts/icons/Glyphter.woff b/css/fonts/icons/Glyphter.woff
new file mode 100644 (file)
index 0000000..e29d8d2
Binary files /dev/null and b/css/fonts/icons/Glyphter.woff differ

diff --git a/css/fonts/icons/style.css b/css/fonts/icons/style.css
index a7edfa3b5b6121cb16968c9c5cc090124b75b3e0..6046fd97e7d14087ed240d54d6b1c33f04b65977 100644 (file)
--- a/css/fonts/icons/style.css
+++ b/css/fonts/icons/style.css
@@ -188,3 +188,23 @@
 .fb-zone-zoom:before {
   content: "\53";
 }
+@font-face {
+  font-family: 'Glyphter';
+  src: url('Glyphter.eot');
+  src: url('Glyphter.eot?#iefix') format('embedded-opentype'),
+  url('Glyphter.woff') format('woff'),
+  url('Glyphter.ttf') format('truetype'),
+  url('Glyphter.svg#Glyphter') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+[class*='fb-icon-']:before{
+  display: inline-block;
+  font-family: 'Glyphter' !important;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale
+}
+.fb-icon-chef:before{content:'\0041';}
\ No newline at end of file

diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index 8ac54241019d686ee819ba8040e954418a8d43b5..b583f353cdefed9b462c32fab0233957a481128d 100644 (file)
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -26,24 +26,29 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
         set_time_limit(0);
         ignore_user_abort(true);
 
-        $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'SiWyC@@1uW');
+        $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'mT3HuyUdCd');
         $references = Fluidbook_Model_Reference::factory()->find();
 
-        $fluidbooks = array();
-        foreach ($references as $reference) {
-            $ids = $reference->getFluidbookId();
-            foreach ($ids as $locale => $id) {
-                if (!$id) {
-                    continue;
+        if (isset($_GET['id'])) {
+            $fluidbooks = explode(',', $_GET['id']);
+        } else {
+            $fluidbooks = array();
+            foreach ($references as $reference) {
+                $ids = $reference->getFluidbookId();
+                foreach ($ids as $locale => $id) {
+                    if (!$id) {
+                        continue;
+                    }
+                    $fluidbooks[] = $id;
                 }
-                $fluidbooks[] = $id;
             }
         }
         $fluidbooks = array_values(array_unique($fluidbooks));
+        print_r($fluidbooks);
 
         $n = 0;
         foreach ($fluidbooks as $fluidbook) {
-            if ($n > 20) {
+            if ($n > 20 && !isset($_GET['all'])) {
                 break;
             }
             try {
@@ -51,7 +56,7 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
                 $dir = PUBLIC_PATH . '/references/' . $fluidbook . '-' . CubeIT_Text::str2URL(trim($meta->title));
 
                 try {
-                    $res = $ws->installBookIfNeeded($fluidbook, $dir, 'auto');
+                    $res = $ws->installBookIfNeeded($fluidbook, $dir, isset($_GET['force']) ? time() : 'auto');
                     if ($res) {
                         $n++;
                     }
@@ -69,7 +74,7 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
 
     public static function importReference($id)
     {
-        $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'SiWyC@@1uW');
+        $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'mT3HuyUdCd');
         $meta = $ws->getMetadata($id);
         $dir = PUBLIC_PATH . '/references/' . $id . '-' . CubeIT_Text::str2URL(trim($meta->title));
         $res = $ws->installBook($id, $dir, 'online', 3, function () use ($id) {
@@ -78,6 +83,6 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController
             `$deleteCmd`;
         });
 
-        echo $id . ' : ' . $dir . ' // ' . print_r($res,true);
+        echo $id . ' : ' . $dir . ' // ' . print_r($res, true);
     }
 }